diff --git a/interface/web/index.php b/interface/web/index.php
index e942c1068810c8eabf587161d638a7e568e7fc9d..af91b265a2b1f45f5541fb0d9fc49e47a9cd39a7 100644
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -35,6 +35,7 @@ if(!isset($_SESSION['s']['module']['name'])) $_SESSION['s']['module']['name'] =
 
 $app->uses('tpl');
 $app->tpl->newTemplate('main.tpl.htm');
+$app->tpl->setVar('logged_in', ($_SESSION['s']['user']['active'] != 1 ? 'n' : 'y'));
 
 // tab change warning?
 // read misc config
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index d6972b9ef93473bd49e498e510a144cd40a5ae8b..3083148a88bb5c6cebd7dabcc3d1ee6cc18b5c03 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -13,7 +13,6 @@
     </tmpl_if>
 
     <div class="pnl_formsarea">
-        <legend>{tmpl_var name='login_txt'}</legend>
             <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="username" id="username" value="" class="form-control"  onkeypress="if (event.keyCode && event.keyCode == 13) {ISPConfig.submitLoginForm('pageForm'); return false;};" /></div></div>
diff --git a/interface/web/themes/default/assets/stylesheets/login.css b/interface/web/themes/default/assets/stylesheets/login.css
new file mode 100644
index 0000000000000000000000000000000000000000..73379eb8bd8bf50b7dddd5e240cd5e90852446cb
--- /dev/null
+++ b/interface/web/themes/default/assets/stylesheets/login.css
@@ -0,0 +1,9 @@
+#content {
+	margin: 0 auto;
+	float: none;
+}
+
+.form-group input[type="checkbox"] {
+	width: auto;
+	height: auto;
+}
\ No newline at end of file
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index d29ab0039f8a589427c27cb0c3172de0b88c4c26..253c989bec9a824a03580cbb5593b6f8a1834b4b 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -18,6 +18,7 @@
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/themes/default/theme.min.css' />
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2.css' />
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2-bootstrap.css' />
+  <tmpl_if name='logged_in' value='n'><link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/login.css' /></tmpl_if>
 </head>
 
 <body>
@@ -59,8 +60,8 @@
             </tmpl_if>
           </div>
         </div>
-		<div id='topnav-container'>
-		</div>
+		<tmpl_if name='logged_in' value='y'><div id='topnav-container'>
+		</div></tmpl_if>
 		<div class='clear'>
           <!-- content -->
           <div id='content' class='right'>
@@ -69,8 +70,8 @@
 			</form>
           </div>
           <!-- news sidebar -->
-          <div id='sidebar' class='news-sidebar left'>
-          </div>
+          <tmpl_if name='logged_in' value='y'><div id='sidebar' class='news-sidebar left'>
+          </div></tmpl_if>
         </div>
         <footer id='footer'>
           powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
