diff --git a/frontend/module.vps.overview.php b/frontend/module.vps.overview.php
index 832ff48..4ac245e 100644
--- a/frontend/module.vps.overview.php
+++ b/frontend/module.vps.overview.php
@@ -38,6 +38,6 @@ $sPageContents = Templater::InlineRender("vps.overview", $locale->strings, array
 	'disk-space'		=> "{$sContainer->sDiskSpace}MB",
 	'total-traffic-limit'	=> "{$sContainer->sTotalTrafficLimit} bytes",
 	'bandwidth-limit'	=> "100mbit",
-	'status'		=> Templater::InlineRender("status.{$sContainer->sStatusText}", $locale->strings)
+	'status'		=> $sContainer->sStatusText
 ));
 ?>
diff --git a/frontend/rewrite.php b/frontend/rewrite.php
index e5306c1..3f5e7cb 100644
--- a/frontend/rewrite.php
+++ b/frontend/rewrite.php
@@ -16,8 +16,6 @@ require("includes/include.base.php");
 
 $sTemplateParameters = array();
 
-$_SESSION['userid'] = 1;
-
 if(!empty($_SESSION['userid']))
 {
 	$sUser = new User($_SESSION['userid']);
diff --git a/frontend/templates/status.running.tpl b/frontend/templates/status.running.tpl
deleted file mode 100644
index 94b952c..0000000
--- a/frontend/templates/status.running.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="online">Running</span>
diff --git a/frontend/templates/status.stopped.tpl b/frontend/templates/status.stopped.tpl
deleted file mode 100644
index 0080ca8..0000000
--- a/frontend/templates/status.stopped.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="offline">Stopped</span>
diff --git a/frontend/templates/status.suspended.tpl b/frontend/templates/status.suspended.tpl
deleted file mode 100644
index f686718..0000000
--- a/frontend/templates/status.suspended.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="suspended">Suspended</span>
diff --git a/frontend/templates/status.unknown.tpl b/frontend/templates/status.unknown.tpl
deleted file mode 100644
index 105cd63..0000000
--- a/frontend/templates/status.unknown.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="unknown">Unknown</span>
diff --git a/frontend/templates/vps.overview.tpl b/frontend/templates/vps.overview.tpl
index e8512cc..3770082 100644
--- a/frontend/templates/vps.overview.tpl
+++ b/frontend/templates/vps.overview.tpl
@@ -47,7 +47,17 @@
 	<table class="vpsinfo">
 		<tr>
 			<th>Status</th>
-			<td><%?status></td>
+			<td>
+				<%if status == running>
+					<span class="online">Running</span>
+				<%/if><%if status == stopped>
+					<span class="offline">Stopped</span>
+				<%/if><%if status == suspended>
+					<span class="suspended">Suspended</span>
+				<%/if><%if status == unknown>
+					<span class="unknown">Unknown</span>
+				<%/if>
+			</td>
 		</tr>
 		<tr>
 			<th>Server location</th>