diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index a66c8984935..52bb7930cad 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -503,12 +503,13 @@ body.login {
   -webkit-box-shadow: 0px 4px 10px #B9B9B9;
   -o-box-shadow: 0px 4px 10px #B9B9B9;
   box-shadow: 0px 4px 10px #B9B9B9;
-  padding: 0;
+  padding: 5px;
   /*+border-radius:4px;*/
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   -khtml-border-radius: 4px;
   border-radius: 4px 4px 4px 4px;
+  overflow: auto;
 }
 
 .install-wizard .eula-copy p {
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index f40aaeba223..8450e5d121d 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -281,12 +281,27 @@
           response: {
             success: function(args) {
               if (args.doInstall && cloudStack.context.users[0].role == 'admin') {
-                cloudStack.uiCustom.installWizard({
-                  $container: $container,
-                  context: context,
-                  complete: function() {
-                    // Show cloudStack main UI
-                    $container.cloudStack(cloudStackArgs);
+                var initInstallWizard = function(eulaHTML) {
+                  cloudStack.uiCustom.installWizard({
+                    $container: $container,
+                    context: context,
+                    eula: eulaHTML,
+                    complete: function() {
+                      // Show cloudStack main UI
+                      $container.cloudStack(cloudStackArgs);
+                    }
+                  });
+                };
+
+                // EULA check
+                $.ajax({
+                  url: 'eula.html',
+                  dataType: 'html',
+                  success: function(html) {
+                    initInstallWizard(html);
+                  },
+                  error: function() {
+                    initInstallWizard(null);
                   }
                 });
               } else {
diff --git a/ui/scripts/ui-custom/installWizard.js b/ui/scripts/ui-custom/installWizard.js
index 9ec05420883..2bd28742f7a 100644
--- a/ui/scripts/ui-custom/installWizard.js
+++ b/ui/scripts/ui-custom/installWizard.js
@@ -3,8 +3,8 @@
     var context = args.context;
     var $installWizard = $('<div>').addClass('install-wizard');
     var $container = args.$container;
+    var eulaHTML = args.eula;
     var state = {}; // Hold wizard form state
-
     var launchStart; // Holds last launch callback, in case of error
     var $launchState;
 
@@ -287,7 +287,7 @@
         var $intro = $('<div></div>').addClass('intro eula');
         var $title = $('<div></div>').addClass('title').html(_l('label.license.agreement'));
         var $subtitle = $('<div></div>').addClass('subtitle').html(_l('label.license.agreement.subtitle'));
-        var $copy = getCopy('eula', $('<div></div>').addClass('eula-copy'));
+        var $copy = $('<div></div>').addClass('eula-copy').html(eulaHTML);
         var $continue = elems.nextButton(_l('label.agree'));
 
         $continue.click(function() {
@@ -776,7 +776,9 @@
       }
     };
 
-    var initialStep = steps.eula().addClass('step');
+    var initialStep = eulaHTML ?
+          steps.eula().addClass('step') : steps.intro().addClass('step');
+
     showDiagram('');
     $('html body').addClass('install-wizard');