diff --git a/src/cloud/occi/lib/ui/public/css/login.css b/src/cloud/occi/lib/ui/public/css/login.css
index e086897b3f..c57dfe230e 100644
--- a/src/cloud/occi/lib/ui/public/css/login.css
+++ b/src/cloud/occi/lib/ui/public/css/login.css
@@ -45,7 +45,7 @@ body {
 }
 
 
-div#logo_sunstone {
+div#logo_selfservice {
     position: relative;
     height: 100px;
     width: 600px;
diff --git a/src/cloud/occi/lib/ui/public/customize/custom.js b/src/cloud/occi/lib/ui/public/customize/custom.js
index e26e24fecc..18d40c72fa 100644
--- a/src/cloud/occi/lib/ui/public/customize/custom.js
+++ b/src/cloud/occi/lib/ui/public/customize/custom.js
@@ -23,9 +23,9 @@ var $network_count = '<span class="network_count" />';
 
 
 
-//Login logo 591x43px - not implemented
+//Login logo 591x43px
 var logo_big = "images/opennebula-selfservice-big.png";
-//Top left logo 179x14px - not implemented
+//Top left logo 179x14px
 var logo_small = "images/opennebula-selfservice-small.png";
 
 
diff --git a/src/cloud/occi/lib/ui/public/js/login.js b/src/cloud/occi/lib/ui/public/js/login.js
index 13eff1f619..36b1e5b057 100644
--- a/src/cloud/occi/lib/ui/public/js/login.js
+++ b/src/cloud/occi/lib/ui/public/js/login.js
@@ -55,6 +55,8 @@ function authenticate(){
 }
 
 $(document).ready(function(){
+    $('div#logo_selfservice').css("background","url("+logo_big+") no-repeat center");
+
     $("#login_form").submit(function (){
         authenticate();
         return false;
@@ -62,7 +64,7 @@ $(document).ready(function(){
 
     //compact login elements according to screen height
     if (screen.height <= 600){
-        $('div#logo_sunstone').css("top","15px");
+        $('div#logo_selfservice').css("top","15px");
         $('div#login').css("top","10px");
         $('.error_message').css("top","10px");
     };
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/configuration.js b/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
index 97c5803b1c..d3ea0b1cc8 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
@@ -59,4 +59,6 @@ $(document).ready(function(){
         hideDialog();
     });
 
+    $('div#logo img').attr('src',logo_small);
+
 });
\ No newline at end of file
diff --git a/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js b/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js
index 1d13154a89..1ff5bf84e4 100644
--- a/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js
+++ b/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js
@@ -98,6 +98,7 @@ locale={
     "See more":"",
     "Select a template":"",
     "Select disk":"",
+    "Select image to upload":"",
     "Self-Service UI Configuration":"",
     "Shutdown":"",
     "Sign out":"",
@@ -132,8 +133,6 @@ locale={
     "Unpublish":"",
     "Update":"",
     "Update template":"",
-    "Upload image":"",
-    "Upload progress":"",
     "Useful links":"",
     "Virtual Machine information":"",
     "virtual machines":"",
diff --git a/src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js b/src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js
index 96d30e7769..8a10534706 100644
--- a/src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js
+++ b/src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js
@@ -1,4 +1,4 @@
-//Translated by
+//Translated by Hector Sanjuan
 lang="es_ES"
 datatable_lang="es_datatable.txt"
 locale={
@@ -98,6 +98,7 @@ locale={
     "See more":"Ver más",
     "Select a template":"Seleccione una plantilla",
     "Select disk":"Seleccione un disco",
+    "Select image to upload":"Seleccione una imagen para subir",
     "Self-Service UI Configuration":"Configuración de la interfaz Self-Service",
     "Shutdown":"Apagar",
     "Sign out":"Desconectar",
@@ -132,8 +133,6 @@ locale={
     "Unpublish":"Despublicar",
     "Update":"Actualizar",
     "Update template":"Actualizar plantilla",
-    "Upload image":"Subir imagen",
-    "Upload progress":"Progreso se subida",
     "Useful links":"Enlances útiles",
     "Virtual Machine information":"Información de máquina virtual",
     "virtual machines":"máquinas virtuales",
diff --git a/src/cloud/occi/lib/ui/templates/login.html b/src/cloud/occi/lib/ui/templates/login.html
index a0bf676c1a..82b80c0785 100644
--- a/src/cloud/occi/lib/ui/templates/login.html
+++ b/src/cloud/occi/lib/ui/templates/login.html
@@ -9,7 +9,9 @@
     <script type="text/javascript" src="vendor/crypto-js/2.3.0-crypto-sha1.js"></script>
     <!-- End Vendor Libraries -->
 
+    <script type="text/javascript" src="js/locale.js"></script>
     <script type="text/javascript" src="js/occi.js"></script>
+    <script type="text/javascript" src="customize/custom.js"></script>
     <script type="text/javascript" src="js/login.js"></script>
 
 </head>
@@ -23,7 +25,7 @@
 </div>
 
 <div id="wrapper">
-      <div id="logo_sunstone">
+      <div id="logo_selfservice">
       </div>
 
       <div id="auth_error" class="error_message">