diff --git a/XenAdmin/Dialogs/AcceptEuaDialog.Designer.cs b/XenAdmin/Dialogs/AcceptEuaDialog.Designer.cs
index 3eee523ce..944de30a6 100644
--- a/XenAdmin/Dialogs/AcceptEuaDialog.Designer.cs
+++ b/XenAdmin/Dialogs/AcceptEuaDialog.Designer.cs
@@ -119,9 +119,11 @@ namespace XenAdmin.Dialogs
             // 
             // AcceptEuaDialog
             // 
+            this.AcceptButton = this.declineButton;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.SystemColors.Control;
+            this.CancelButton = this.declineButton;
             this.Controls.Add(this.tableLayoutPanel);
             this.HelpButton = false;
             this.Name = "AcceptEuaDialog";
diff --git a/XenAdmin/Dialogs/AcceptEuaDialog.resx b/XenAdmin/Dialogs/AcceptEuaDialog.resx
index 91c25d880..44c2d5d43 100644
--- a/XenAdmin/Dialogs/AcceptEuaDialog.resx
+++ b/XenAdmin/Dialogs/AcceptEuaDialog.resx
@@ -244,7 +244,7 @@
     <value>Segoe UI, 9pt</value>
   </data>
   <data name="warningTableLayoutPanel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 381</value>
+    <value>6, 383</value>
   </data>
   <data name="warningTableLayoutPanel.RowCount" type="System.Int32, mscorlib">
     <value>1</value>
@@ -283,7 +283,7 @@
     <value>0, 0</value>
   </data>
   <data name="euaTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>580, 339</value>
+    <value>580, 341</value>
   </data>
   <data name="euaTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>20</value>
@@ -313,7 +313,7 @@
     <value>6, 36</value>
   </data>
   <data name="euaPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>580, 339</value>
+    <value>580, 341</value>
   </data>
   <data name="euaPanel.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -406,10 +406,10 @@
     <value>Segoe UI, 9pt</value>
   </data>
   <data name="buttonsFlowLayoutPanel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 431</value>
+    <value>6, 433</value>
   </data>
   <data name="buttonsFlowLayoutPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>580, 34</value>
+    <value>580, 32</value>
   </data>
   <data name="buttonsFlowLayoutPanel.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
@@ -463,7 +463,7 @@
     <value>0</value>
   </data>
   <data name="tableLayoutPanel.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="infoLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="warningTableLayoutPanel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="euaPanel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonsFlowLayoutPanel" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="Absolute,30,Percent,100,AutoSize,0,Absolute,40" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="infoLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="warningTableLayoutPanel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="euaPanel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonsFlowLayoutPanel" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="Absolute,30,Percent,100,AutoSize,0,Absolute,38" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>