diff --git a/XenAdmin/Controls/DiskSpinner.resx b/XenAdmin/Controls/DiskSpinner.resx
index 65489c50e..e9b555fca 100644
--- a/XenAdmin/Controls/DiskSpinner.resx
+++ b/XenAdmin/Controls/DiskSpinner.resx
@@ -231,7 +231,7 @@
     <value>304, 22</value>
   </data>
   <data name="tableLayoutPanelError.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;tableLayoutPanelError.Name" xml:space="preserve">
     <value>tableLayoutPanelError</value>
@@ -258,7 +258,7 @@
     <value>50, 23</value>
   </data>
   <data name="comboBoxUnits.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;comboBoxUnits.Name" xml:space="preserve">
     <value>comboBoxUnits</value>
@@ -282,7 +282,7 @@
     <value>105, 23</value>
   </data>
   <data name="DiskSizeNumericUpDown.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+    <value>0</value>
   </data>
   <data name="DiskSizeNumericUpDown.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
     <value>Right</value>
diff --git a/XenAdmin/Dialogs/NewDiskDialog.resx b/XenAdmin/Dialogs/NewDiskDialog.resx
index d6e05e4f0..578c55764 100644
--- a/XenAdmin/Dialogs/NewDiskDialog.resx
+++ b/XenAdmin/Dialogs/NewDiskDialog.resx
@@ -142,7 +142,7 @@
     <value>75, 23</value>
   </data>
   <data name="CloseButton.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
+    <value>10</value>
   </data>
   <data name="CloseButton.Text" xml:space="preserve">
     <value>Cancel</value>
@@ -340,7 +340,7 @@
     <value>56, 15</value>
   </data>
   <data name="label4.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
+    <value>7</value>
   </data>
   <data name="label4.Text" xml:space="preserve">
     <value>&amp;Location:</value>
@@ -406,7 +406,7 @@
     <value>75, 23</value>
   </data>
   <data name="OkButton.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>9</value>
   </data>
   <data name="OkButton.Text" xml:space="preserve">
     <value>&amp;Add</value>
@@ -445,7 +445,7 @@
     <value>551, 29</value>
   </data>
   <data name="diskSpinner1.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
+    <value>6</value>
   </data>
   <data name="&gt;&gt;diskSpinner1.Name" xml:space="preserve">
     <value>diskSpinner1</value>
@@ -514,7 +514,7 @@
     <value>545, 174</value>
   </data>
   <data name="SrListBox.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
+    <value>8</value>
   </data>
   <data name="&gt;&gt;SrListBox.Name" xml:space="preserve">
     <value>SrListBox</value>
diff --git a/XenAdmin/SettingsPanels/VDISizeLocationPage.resx b/XenAdmin/SettingsPanels/VDISizeLocationPage.resx
index 9660571c3..d179ed1d6 100644
--- a/XenAdmin/SettingsPanels/VDISizeLocationPage.resx
+++ b/XenAdmin/SettingsPanels/VDISizeLocationPage.resx
@@ -172,7 +172,7 @@
     <value>51, 13</value>
   </data>
   <data name="locationLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>3</value>
   </data>
   <data name="locationLabel.Text" xml:space="preserve">
     <value>Location:</value>
@@ -313,7 +313,7 @@
     <value>552, 22</value>
   </data>
   <data name="tableLayoutPanelInfo.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;tableLayoutPanelInfo.Name" xml:space="preserve">
     <value>tableLayoutPanelInfo</value>
@@ -349,7 +349,7 @@
     <value>51, 13</value>
   </data>
   <data name="labelLocationValueRO.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>4</value>
   </data>
   <data name="labelLocationValueRO.Text" xml:space="preserve">
     <value>SR name</value>
@@ -385,7 +385,7 @@
     <value>501, 29</value>
   </data>
   <data name="diskSpinner1.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;diskSpinner1.Name" xml:space="preserve">
     <value>diskSpinner1</value>
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index ac78ad3c6..c4deadfd8 100755
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -20983,7 +20983,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid number.
+        ///   Looks up a localized string similar to Invalid disk size.
         /// </summary>
         public static string INVALID_NUMBER {
             get {
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index 6525a0bdb..a4856e03d 100755
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -7291,7 +7291,7 @@ This might result in failure to migrate VMs to this server during the RPU or to
     <value>Invalid hostname</value>
   </data>
   <data name="INVALID_NUMBER" xml:space="preserve">
-    <value>Invalid number</value>
+    <value>Invalid disk size</value>
   </data>
   <data name="INVALID_OVF" xml:space="preserve">
     <value>This does not appear to be a valid OVF file.</value>