diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 8b65e2e1751..33fd0214d47 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -31,7 +31,8 @@ public function getListHooksRegistered()
             'Request.initAuthenticationObject' => 'initAuthenticationObject',
             'User.isNotAuthorized'             => 'noAccess',
             'API.Request.authenticate'         => 'ApiRequestAuthenticate',
-            'AssetManager.getJavaScriptFiles'  => 'getJsFiles'
+            'AssetManager.getJavaScriptFiles'  => 'getJsFiles',
+            'AssetManager.getStylesheetFiles'  => 'getStylesheetFiles'
         );
         return $hooks;
     }
@@ -41,6 +42,12 @@ public function getJsFiles(&$jsFiles)
         $jsFiles[] = "plugins/Login/javascripts/login.js";
     }
 
+   public function getStylesheetFiles(&$stylesheetFiles)
+    {
+        $stylesheetFiles[] = "plugins/Login/stylesheets/login.less";
+        $stylesheetFiles[] = "plugins/Login/stylesheets/variables.less";
+    }
+
     /**
      * Redirects to Login form with error message.
      * Listens to User.isNotAuthorized hook.
diff --git a/plugins/Login/stylesheets/login.css b/plugins/Login/stylesheets/login.less
similarity index 98%
rename from plugins/Login/stylesheets/login.css
rename to plugins/Login/stylesheets/login.less
index ba78fb41ef1..d7628ab9180 100644
--- a/plugins/Login/stylesheets/login.css
+++ b/plugins/Login/stylesheets/login.less
@@ -60,7 +60,7 @@
 }
 
 .loginSection {
-    background-color: #fafafa;
+    background-color: @login-section-background;
     width: 360px;
     padding: 30px;
     margin: 50px auto 0 auto;
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index cd18c8f1900..ec8760a9919 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -9,7 +9,6 @@
     {% autoescape false %}
     {{ includeAssets({"type": "css"}) }}
     {% endautoescape %}
-    <link rel="stylesheet" type="text/css" href="plugins/Login/stylesheets/login.css"/>
     <meta name="description" content="{{ 'General_OpenSourceWebAnalytics'|translate }}"/>
     <meta name="apple-itunes-app" content="app-id=737216887" />
     <meta name="google-play-app" content="app-id=org.piwik.mobile2">
diff --git a/plugins/Morpheus/stylesheets/simple_structure.css b/plugins/Morpheus/stylesheets/simple_structure.css
index 5ae327d67c8..6198916ad6c 100644
--- a/plugins/Morpheus/stylesheets/simple_structure.css
+++ b/plugins/Morpheus/stylesheets/simple_structure.css
@@ -2,7 +2,7 @@ body#simple  {
 	background: #eee;
 }
 #contentsimple {
-	background: @theme-color-background-base;
+	background: #fff;
 	color: #000;
 	font-family: Arial, Georgia, "Times New Roman", Times, serif;
 	padding: 1em 2em;