--- a/admin.inc.php	Sun Dec 09 06:21:19 2012 +0200
+++ b/admin.inc.php	Mon Dec 10 11:14:05 2012 +0200
@@ -1,4 +1,6 @@
 <?
+$sessionType = "admin";
+
 function stCreateSettingsData()
 {
   $args = array();
@@ -46,11 +48,11 @@
   echo
     "<h1>Party admin login</h1>\n".
     "<p>Please use illegal telepathy over HTTP to provide a password to enter the party administration systembolaget.</p>\n".
-    "<form name=\"admlogin\" action=\"login.php\" method=\"post\">\n".
+    stGetFormStart("admlogin", "admlogin.php").
     stGetFormHiddenInput("mode", "check")."\n".
-    stGetFormHiddenInput("goto", $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"])."\n".
-    stGetFormPasswordInput("admpass","", "")."\n".
-    " <input type=\"submit\" value=\" Login \" />\n".
+    stGetFormHiddenInput("goto", "admin")."\n".
+    stGetFormPasswordInput("admpass", "", "")."\n".
+    stGetFormSubmitInput("submit", "Login").
     "</form>\n";
 
   $authState = "login";
@@ -114,7 +116,7 @@
     {
       if (req.status == 404)
       {
-        window.location = "logout";
+        window.location = "admlogout.php";
       }
       else
       if (req.status == 200)
@@ -376,7 +378,7 @@
       "')\">"+registeredTabs[id]+"</a>";
   }
   
-  str += "<a class=\"admin\" href=\"logout\">Logout</a>";
+  str += "<a class=\"admin\" href=\"admlogout.php\">Logout</a>";
   
   item.innerHTML = str;
 }