diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 00b06ab0e61..5b6d5195e1d 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -460,6 +460,12 @@
     };
 		
     document.title = 'CloudStack';
+
+    if ($.cookie('loginUrl') != null || $.urlParam('loginUrl') != 0) {
+      // SSO
+      loginArgs.hideLoginScreen = true;
+    }
+    
     cloudStack.uiCustom.login(loginArgs);
 
     // Localization
diff --git a/ui/scripts/ui-custom/login.js b/ui/scripts/ui-custom/login.js
index c092b82ec0e..8769609e2a5 100644
--- a/ui/scripts/ui-custom/login.js
+++ b/ui/scripts/ui-custom/login.js
@@ -128,5 +128,11 @@
     });
     
     $languageSelect.val($.cookie('lang'));
+
+    // Hide login screen, mainly for SSO
+    if (args.hideLoginScreen) {
+      $login.children().hide();
+      $login.append($('<div>').addClass('loading-overlay'));
+    }
   };
 })(jQuery, cloudStack);