diff --git a/src/cloud/occi/lib/occi-server.rb b/src/cloud/occi/lib/occi-server.rb
index cfadd287a2..5eb9a97846 100755
--- a/src/cloud/occi/lib/occi-server.rb
+++ b/src/cloud/occi/lib/occi-server.rb
@@ -324,7 +324,7 @@ post '/config' do
 end
 
 get '/ui/login' do
-    File.read(File.dirname(__FILE__)+'/ui/templates/login.html')
+    redirect to('ui')
 end
 
 post '/ui/login' do
diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js
index b09f67013d..24a4cf81ae 100644
--- a/src/sunstone/public/js/sunstone-util.js
+++ b/src/sunstone/public/js/sunstone-util.js
@@ -326,7 +326,14 @@ function onError(request,error_json) {
 
     //redirect to login if unauthenticated
     if (error_json.error.http_status=="401") {
-        window.location.href = "login";
+        switch (whichUI()){
+        case "selfservice":
+            window.location.href = "ui";
+            break;
+        default:
+            window.location.href = "login";
+        };
+
         onError.disabled=false;
         return false;
     };
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index bc9770fa5d..73cb79fd84 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -403,7 +403,7 @@ function setLogin(){
     case "ozones":
         username = cookie["ozones-user"];
         break;
-    case "occi":
+    case "selfservice":
         username = cookie["occi-user"];
         break;
     };
@@ -420,7 +420,7 @@ function setLogin(){
         case "ozones":
             oZones.Auth.logout({success:redirect});
             break;
-        case "occi":
+        case "selfservice":
             OCCI.Auth.logout({success:function(){window.location.href = "ui";}});
             break;
         }
@@ -436,7 +436,7 @@ function whichUI(){
     if (typeof(oZones)!="undefined")
         return "ozones";
     if (typeof(OCCI)!="undefined")
-        return "occi";
+        return "selfservice";
 };
 
 //Inserts all main tabs in the DOM