diff --git a/css/lightdm-uestibulum.css b/css/lightdm-uestibulum.css
deleted file mode 100644
index 0ea2c8f..0000000
--- a/css/lightdm-uestibulum.css
+++ /dev/null
@@ -1,52 +0,0 @@
-* { margin: 0; padding: 0; }
-
-body {
-  font-family: sans-serif
-}
-
-#bg {
-  position: fixed;
-  width: 100%;
-  display: block;
-  bottom: 0;
-  right: 0;
-  z-index: -1;
-}
-
-#power-panel {
-  color: white;
-  cursor: pointer;
-
-  background: rgba(8, 8, 8, 0.3);
-  box-shadow: 0px 0px 1em 1em (8, 8, 8, 0.3);
-  position: absolute;
-  bottom: 2em;
-  opacity: 0.5;
-  right: 2em;
-  transition: 1s;
-}
-
-#power-options {
-  border-radius: 10px;
-  padding: 1em;
-  transition: 1s;
-  display: none;
-}
-
-#power-panel.active #power-options {
-  display: block;
-}
-
-#power-panel.active #power-button { display: none; }
-
-#power-options ul { list-style: none; }
-
-#power-options li {
-  margin-bottom: 1em;
-  font-size: 200%;
-}
-
-#power-options li:last-child {
-  margin-bottom: 0;
-}
-
diff --git a/css/lightdm-uestibulum.scss b/css/lightdm-uestibulum.scss
index af3c316..1858777 100644
--- a/css/lightdm-uestibulum.scss
+++ b/css/lightdm-uestibulum.scss
@@ -99,7 +99,7 @@ body {
     color: $colorFG;
     font-size: 1vw;
     margin-top: 0.5em;
-    //opacity: 0;
+    opacity: 0;
     transition: 0.5s;
     width: 20em;
 
@@ -146,8 +146,10 @@ body {
   &:hover { opacity: 1 };
 
   #sessions-list li { display: inline-block; }
+
 }
 
+
 #sessions { 
   cursor: pointer;
   display: inline-block;
@@ -172,6 +174,10 @@ body {
   #fail-msg { opacity: 1 !important; }
 }
 
+.lock-screen {
+  #session-panel { display: none !important; }
+}
+
 @keyframes throb {
   from { opacity: 1; }
   to { opacity: 0; }
diff --git a/js/lightdm-uestibulum.js b/js/lightdm-uestibulum.js
index 57d0f72..6bf4577 100644
--- a/js/lightdm-uestibulum.js
+++ b/js/lightdm-uestibulum.js
@@ -91,6 +91,8 @@
     },
 
     showUserSelect: function() {
+      if (lightdm.lock_hint || lightdm.users.length === 1) return;
+
       this.$el.removeClass('failed-auth');
       this.$el.find('#users').addClass('select-user');
       lightdm.cancel_authentication();
@@ -121,6 +123,7 @@
       this.$el.removeClass('failed-auth');
       //if (e.key != 'Enter') return;
       if (e.keyCode != 13) return;
+      if (!lightdm.in_authentication) lightdm.authenticate(this.user.name);
       lightdm.respond($(e.target).val());
     }
 
@@ -170,6 +173,9 @@
       _.bindAll(this, 'render', 'authComplete', 'checkTimePeriod');
 
       window.authentication_complete = this.authComplete;
+      window.autologin_timer_expired = function() {};
+
+      if (lightdm.lock_hint) this.$el.addClass('lock-screen');
 
       this.timePeriod = 'day';
       this.loginView = new U.LoginView({uiView: this});
@@ -181,7 +187,7 @@
 
     authComplete: function() {
       if (lightdm.is_authenticated) {
-        //lightdm.start_session_sync(this.sessionView.session.key);
+        //lightdm.start_session(this.sessionView.session.key);
         lightdm.login(this.loginView.user, this.sessionView.session.key);
       }
       else {