diff --git a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs
index dfb173c7f..6560da9c8 100644
--- a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs
+++ b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.Designer.cs
@@ -36,16 +36,16 @@
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.buttonClearAll = new System.Windows.Forms.Button();
             this.dataGridViewSRs = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx();
-            this.columnTick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.columnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.columnDesc = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.columnType = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.columnMetadata = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.FindSrsButton = new System.Windows.Forms.Button();
             this.buttonSelectAll = new System.Windows.Forms.Button();
             this.FindSrsOptionsMenuStrip = new XenAdmin.Controls.NonReopeningContextMenuStrip(this.components);
             this.iscsiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.fcToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.columnTick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.columnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.columnDesc = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.columnType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.columnMetadata = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tableLayoutPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewSRs)).BeginInit();
             this.FindSrsOptionsMenuStrip.SuspendLayout();
@@ -101,39 +101,6 @@
             this.dataGridViewSRs.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewSRs_CellValueChanged);
             this.dataGridViewSRs.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewSRs_CellClick);
             // 
-            // columnTick
-            // 
-            resources.ApplyResources(this.columnTick, "columnTick");
-            this.columnTick.Name = "columnTick";
-            // 
-            // columnName
-            // 
-            this.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            resources.ApplyResources(this.columnName, "columnName");
-            this.columnName.Name = "columnName";
-            this.columnName.ReadOnly = true;
-            // 
-            // columnDesc
-            // 
-            this.columnDesc.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            resources.ApplyResources(this.columnDesc, "columnDesc");
-            this.columnDesc.Name = "columnDesc";
-            this.columnDesc.ReadOnly = true;
-            // 
-            // columnType
-            // 
-            this.columnType.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            resources.ApplyResources(this.columnType, "columnType");
-            this.columnType.Name = "columnType";
-            this.columnType.ReadOnly = true;
-            // 
-            // columnMetadata
-            // 
-            this.columnMetadata.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            resources.ApplyResources(this.columnMetadata, "columnMetadata");
-            this.columnMetadata.Name = "columnMetadata";
-            this.columnMetadata.ReadOnly = true;
-            // 
             // FindSrsButton
             // 
             resources.ApplyResources(this.FindSrsButton, "FindSrsButton");
@@ -169,6 +136,39 @@
             resources.ApplyResources(this.fcToolStripMenuItem, "fcToolStripMenuItem");
             this.fcToolStripMenuItem.Click += new System.EventHandler(this.fcToolStripMenuItem_Click);
             // 
+            // columnTick
+            // 
+            resources.ApplyResources(this.columnTick, "columnTick");
+            this.columnTick.Name = "columnTick";
+            // 
+            // columnName
+            // 
+            this.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            resources.ApplyResources(this.columnName, "columnName");
+            this.columnName.Name = "columnName";
+            this.columnName.ReadOnly = true;
+            // 
+            // columnDesc
+            // 
+            this.columnDesc.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            resources.ApplyResources(this.columnDesc, "columnDesc");
+            this.columnDesc.Name = "columnDesc";
+            this.columnDesc.ReadOnly = true;
+            // 
+            // columnType
+            // 
+            this.columnType.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            resources.ApplyResources(this.columnType, "columnType");
+            this.columnType.Name = "columnType";
+            this.columnType.ReadOnly = true;
+            // 
+            // columnMetadata
+            // 
+            this.columnMetadata.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            resources.ApplyResources(this.columnMetadata, "columnMetadata");
+            this.columnMetadata.Name = "columnMetadata";
+            this.columnMetadata.ReadOnly = true;
+            // 
             // DRFailoverWizardStoragePage
             // 
             resources.ApplyResources(this, "$this");
@@ -192,12 +192,12 @@
         private System.Windows.Forms.ToolStripMenuItem fcToolStripMenuItem;
         private System.Windows.Forms.Button FindSrsButton;
         private XenAdmin.Controls.DataGridViewEx.DataGridViewEx dataGridViewSRs;
+        private System.Windows.Forms.Button buttonSelectAll;
+        private System.Windows.Forms.Button buttonClearAll;
         private System.Windows.Forms.DataGridViewCheckBoxColumn columnTick;
         private System.Windows.Forms.DataGridViewTextBoxColumn columnName;
         private System.Windows.Forms.DataGridViewTextBoxColumn columnDesc;
         private System.Windows.Forms.DataGridViewTextBoxColumn columnType;
         private System.Windows.Forms.DataGridViewTextBoxColumn columnMetadata;
-        private System.Windows.Forms.Button buttonSelectAll;
-        private System.Windows.Forms.Button buttonClearAll;
     }
 }
diff --git a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx
index 0cfd130a2..5ac13b8af 100644
--- a/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx
+++ b/XenAdmin/Wizards/DRWizards/DRFailoverWizardStoragePage.resx
@@ -175,7 +175,7 @@
     <value>80</value>
   </data>
   <data name="columnName.Width" type="System.Int32, mscorlib">
-    <value>160</value>
+    <value>115</value>
   </data>
   <metadata name="columnDesc.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -187,7 +187,7 @@
     <value>80</value>
   </data>
   <data name="columnDesc.Width" type="System.Int32, mscorlib">
-    <value>150</value>
+    <value>115</value>
   </data>
   <metadata name="columnType.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -408,6 +408,18 @@
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
     <value>557, 366</value>
   </data>
+  <data name="&gt;&gt;iscsiToolStripMenuItem.Name" xml:space="preserve">
+    <value>iscsiToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;iscsiToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;fcToolStripMenuItem.Name" xml:space="preserve">
+    <value>fcToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;fcToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;columnTick.Name" xml:space="preserve">
     <value>columnTick</value>
   </data>
@@ -438,18 +450,6 @@
   <data name="&gt;&gt;columnMetadata.Type" xml:space="preserve">
     <value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;iscsiToolStripMenuItem.Name" xml:space="preserve">
-    <value>iscsiToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;iscsiToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;fcToolStripMenuItem.Name" xml:space="preserve">
-    <value>fcToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;fcToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>DRFailoverWizardStoragePage</value>
   </data>
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index b61a87b19..baacf9352 100644
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -10955,7 +10955,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select the storage repositories (SRs) containing the configuration data for the VMs and vApps that you want to fail back and then click Next..
+        ///   Looks up a localized string similar to Select the storage repositories (SRs) containing the configuration data for the VMs and vApps that you want to fail back. If you know which SRs contain your VMs&apos; disks, you can also include them now..
         /// </summary>
         public static string DR_WIZARD_STORAGEPAGE_DESCRIPTION_FAILBACK {
             get {
@@ -10964,7 +10964,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select the storage repositories (SRs) containing the VM configuration data for the VMs and vApps that you want to fail over and then click Next..
+        ///   Looks up a localized string similar to Select the storage repositories (SRs) containing the VM configuration data for the VMs and vApps that you want to fail over. If you know which SRs contain your VMs&apos; disks, you can also include them now..
         /// </summary>
         public static string DR_WIZARD_STORAGEPAGE_DESCRIPTION_FAILOVER {
             get {
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index 51134bdc9..da359450f 100644
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -3899,10 +3899,10 @@ Eject the CD and try again.</value>
     <value>Selected SRs: </value>
   </data>
   <data name="DR_WIZARD_STORAGEPAGE_DESCRIPTION_FAILBACK" xml:space="preserve">
-    <value>Select the storage repositories (SRs) containing the configuration data for the VMs and vApps that you want to fail back and then click Next.</value>
+    <value>Select the storage repositories (SRs) containing the configuration data for the VMs and vApps that you want to fail back. If you know which SRs contain your VMs' disks, you can also include them now.</value>
   </data>
   <data name="DR_WIZARD_STORAGEPAGE_DESCRIPTION_FAILOVER" xml:space="preserve">
-    <value>Select the storage repositories (SRs) containing the VM configuration data for the VMs and vApps that you want to fail over and then click Next.</value>
+    <value>Select the storage repositories (SRs) containing the VM configuration data for the VMs and vApps that you want to fail over. If you know which SRs contain your VMs' disks, you can also include them now.</value>
   </data>
   <data name="DR_WIZARD_STORAGEPAGE_SCAN_RESULT_NONE" xml:space="preserve">
     <value>No Storage Repositories were found</value>