diff --git a/console/templates/console-spice-full.html b/console/templates/console-spice-full.html
index 587e7a9..450369e 100644
--- a/console/templates/console-spice-full.html
+++ b/console/templates/console-spice-full.html
@@ -63,7 +63,7 @@
 
 {% block content %}
 
-        <div id="login">
+        <div id="login" hidden>
             <span class="logo">SPICE</span>
             <label for="host">Host:</label> <input type='text' id='host' value='{{ ws_host }}'> <!-- localhost -->
             <label for="port">Port:</label> <input type='text' id='port' value='{{ ws_port }}'>
@@ -213,7 +213,7 @@
             }
 
              function fullscreen() {
-                var screen=document.getElementById('spice-area');
+                var screen=document.getElementById('spice-screen?');
                 if(screen.requestFullscreen) {
                     screen.requestFullscreen();
                 } else if(screen.mozRequestFullScreen) {
diff --git a/console/templates/console-spice-lite.html b/console/templates/console-spice-lite.html
index d70f798..f718a5c 100644
--- a/console/templates/console-spice-lite.html
+++ b/console/templates/console-spice-lite.html
@@ -27,7 +27,7 @@
 {% load staticfiles %}
 {% block head %}
 
-        <title>Spice Javascript client</title>
+        <title>WebVirtCloud - Spice - Lite</title>
         <script src="{% static "js/spice-html5/spicearraybuffer.js" %}"></script>
         <script src="{% static "js/spice-html5/enums.js" %}"></script>
         <script src="{% static "js/spice-html5/atKeynames.js" %}"></script>
@@ -140,6 +140,8 @@
 
                 //password = spice_query_var('password', '');
                 password = '{{ console_passwd | safe }}';
+                if (password === 'None') password = '';
+
                 path = spice_query_var('path', 'websockify');
 
                 if ((!host) || (!port)) {
@@ -233,7 +235,7 @@
             }
 
             function fullscreen() {
-                var screen=document.getElementById('spice-area');
+                var screen=document.getElementById('spice-screen');
                 if(screen.requestFullscreen) {
                     screen.requestFullscreen();
                 } else if(screen.mozRequestFullScreen) {