diff --git a/frontend/css/cvm.css b/frontend/css/cvm.css
index 3362d8c..0c03dbd 100644
--- a/frontend/css/cvm.css
+++ b/frontend/css/cvm.css
@@ -424,3 +424,21 @@ table.vpslist tr:hover
 	margin: 0px;
 	padding-left: 24px;
 }
+
+
+input
+{
+	padding: 4px 6px;
+}
+
+input, label
+{
+	margin-top: 0px !important;
+	margin-bottom: 0px !important;
+}
+
+button.column
+{
+	margin-left: 1.6% !important;
+	margin-right: 1.6% !important;
+}
diff --git a/frontend/module.login.php b/frontend/module.login.php
new file mode 100644
index 0000000..8538190
--- /dev/null
+++ b/frontend/module.login.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ * CVM is more free software. It is licensed under the WTFPL, which
+ * allows you to do pretty much anything with it, without having to
+ * ask permission. Commercial use is allowed, and no attribution is
+ * required. We do politely request that you share your modifications
+ * to benefit other developers, but you are under no enforced
+ * obligation to do so :)
+ * 
+ * Please read the accompanying LICENSE document for the full WTFPL
+ * licensing text.
+ */
+
+if(!isset($_CVM)) { die("Unauthorized."); }
+
+if($sLoggedIn === true)
+{
+	// TODO: alert the user that he will switch to a different account, or disable if it is not allowed to have multiple accounts
+}
+
+$sError = "";
+$sFieldUsername = "";
+$render_form = true;
+
+if(isset($_POST['submit']))
+{
+	$sUsername = mysql_real_escape_string($_POST['username']);
+	$sFieldUsername = htmlentities($_POST['username']);
+	
+	if($result = mysql_query_cached("SELECT * FROM users WHERE `Username` = '{$sUsername}'"))
+	{
+		$sLoginUser = new User($result);
+		
+		if($sLoginUser->VerifyPassword($_POST['password']))
+		{
+			$_SESSION['userid'] = $sLoginUser->sId;
+			header("Location: /");
+			die();
+		}
+		else
+		{
+			$err = new CPHPErrorHandler(CPHP_ERRORHANDLER_TYPE_ERROR, "Login failed", "The login details you provided are invalid. Please try again.");
+			$sError .= $err->Render();
+		}
+	}
+	else
+	{
+		$err = new CPHPErrorHandler(CPHP_ERRORHANDLER_TYPE_ERROR, "Login failed", "The login details you provided are invalid. Please try again.");
+		$sError .= $err->Render();
+	}
+}
+
+$sMainContents = Templater::InlineRender("login", $locale->strings, array(
+	'error'			=> $sError,
+	'field-username'	=> $sFieldUsername
+));
diff --git a/frontend/module.logout.php b/frontend/module.logout.php
new file mode 100644
index 0000000..37c20da
--- /dev/null
+++ b/frontend/module.logout.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ * CVM is more free software. It is licensed under the WTFPL, which
+ * allows you to do pretty much anything with it, without having to
+ * ask permission. Commercial use is allowed, and no attribution is
+ * required. We do politely request that you share your modifications
+ * to benefit other developers, but you are under no enforced
+ * obligation to do so :)
+ * 
+ * Please read the accompanying LICENSE document for the full WTFPL
+ * licensing text.
+ */
+
+if(!isset($_CVM)) { die("Unauthorized."); }
+
+if($sLoggedIn === true)
+{
+	unset($_SESSION['userid']);
+	$sUser = new User(0);
+	$sLoggedIn = false;
+	
+	$err = new CPHPErrorHandler(CPHP_ERRORHANDLER_TYPE_SUCCESS, "Successfully logged out", "You have been successfully logged out. You can now close this page.");
+	$sMainContents .= $err->Render();
+}
+else
+{
+	$err = new CPHPErrorHandler(CPHP_ERRORHANDLER_TYPE_ERROR, "You are not logged in", "You can only logout when you are already logged in.");
+	$sMainContents .= $err->Render();
+}
diff --git a/frontend/rewrite.php b/frontend/rewrite.php
index fc2546a..fa7f597 100644
--- a/frontend/rewrite.php
+++ b/frontend/rewrite.php
@@ -16,7 +16,7 @@ require("includes/include.base.php");
 
 $sTemplateParameters = array();
 
-$_SESSION['userid'] = 1;
+//$_SESSION['userid'] = 1;
 
 if(!empty($_SESSION['userid']))
 {
diff --git a/frontend/templates/login.tpl b/frontend/templates/login.tpl
new file mode 100644
index 0000000..3c489ac
--- /dev/null
+++ b/frontend/templates/login.tpl
@@ -0,0 +1,18 @@
+<h1>Login to your VPS panel</h1>
+
+<%?error>
+
+<form method="post" action="/login/" class="col_12">
+	<div class="col_3"></div>
+	<label class="col_2" for="field_username">Username</label>
+	<input class="col_4" type="text" name="username" id="field_username" value="">
+	<div class="clear"></div>
+
+	<div class="col_3"></div>
+	<label class="col_2" for="field_password">Password</label>
+	<input class="col_4" type="password" name="password" id="field_password">
+	<div class="clear"></div>
+
+	<div class="col_7"></div>
+	<button class="col_2" type="submit" name="submit">Login</button>
+</form>
diff --git a/frontend/templates/main.tpl b/frontend/templates/main.tpl
index 8fca7dc..7c39fbb 100644
--- a/frontend/templates/main.tpl
+++ b/frontend/templates/main.tpl
@@ -5,7 +5,6 @@
 		<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700">
 		<link rel="stylesheet" href="/css/cvm.css?1">
 		<link rel="stylesheet" href="/css/kickstart-grid.css" media="all">
-		<link rel="stylesheet" href="/css/kickstart-forms.css" media="all">
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 		<script src="/js/prettify.js"></script>
 		<script src="/js/kickstart.js"></script>
diff --git a/frontend/templates/main.vps.tpl b/frontend/templates/main.vps.tpl
index 3cd3e84..1b11432 100644
--- a/frontend/templates/main.vps.tpl
+++ b/frontend/templates/main.vps.tpl
@@ -2,11 +2,11 @@
 	<a class="sidebutton" id="button_overview" href="/<%?id>/">Overview</a>
 	<a class="sidebutton" id="button_statistics" href="/<%?id>/statistics/">Statistics</a>
 	<a class="sidebutton" id="button_reinstall" href="/<%?id>/reinstall/">Reinstall</a>
-	<a class="sidebutton" id="button_backup" href="/<%?id>/backup/">Backups</a>
+	<!-- <a class="sidebutton" id="button_backup" href="/<%?id>/backup/">Backups</a> -->
 	<a class="sidebutton" id="button_webshell" href="/<%?id>/webshell/">WebShell</a>
 	<a class="sidebutton" id="button_ip" href="/<%?id>/ip/">IP Allocation</a>
-	<a class="sidebutton" id="button_alerts" href="/<%?id>/alerts/">Alerts</a>
-	<a class="sidebutton" id="button_api" href="/<%?id>/api/">API</a>
+	<!-- <a class="sidebutton" id="button_alerts" href="/<%?id>/alerts/">Alerts</a>
+	<a class="sidebutton" id="button_api" href="/<%?id>/api/">API</a> -->
 </div>
 
 <%?error>