diff --git a/login.php b/login.php
index 2521d02..f1b237b 100644
--- a/login.php
+++ b/login.php
@@ -46,7 +46,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 	if (empty($message)) {
 		session_start();
 		$_SESSION['sessid']['username'] = $username;
-		header("Location: main.php");
+		header("Location: list-domain.php");
 		exit;
 	}
 } 
diff --git a/main.php b/main.php
deleted file mode 100644
index e6cdc75..0000000
--- a/main.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-// 
-// OpenSMTPD Admin 
-// by Mischa Peters <mischa at high5 dot nl>
-// Copyright (c) 2022 High5!
-// License Info: LICENSE.TXT
-//
-// File: main.php
-//
-// Template File: main.tpl
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST / GET Variables:
-//
-// -none-
-//
-require_once './functions.inc.php';
-include './languages/' . check_language() . '.lang';
-
-$SESSID_USERNAME = check_session();
-
-include './templates/header.tpl';
-include './templates/menu.tpl';
-include './templates/main.tpl';
-include './templates/footer.tpl';
-?>
diff --git a/templates/main.tpl b/templates/main.tpl
deleted file mode 100644
index 2996c17..0000000
--- a/templates/main.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<div id="main_menu">
-<table>
-	<tr>
-		<td nowrap><a target="_top" href="list-domain.php"><?php echo $LANG['Menu_overview']; ?></a></td>
-		<td><?php echo $LANG['Main_overview']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="add-alias.php"><?php echo $LANG['Menu_create_alias']; ?></a></td>
-		<td><?php echo $LANG['Main_create_alias']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="add-mailbox.php"><?php echo $LANG['Menu_create_mailbox']; ?></a></td>
-		<td><?php echo $LANG['Main_create_mailbox']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="sendmail.php"><?php echo $LANG['Menu_sendmail']; ?></a></td>
-		<td><?php echo $LANG['Main_sendmail']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="password.php"><?php echo $LANG['Menu_password']; ?></a></td>
-		<td><?php echo $LANG['Main_password']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="viewlog.php"><?php echo $LANG['Menu_viewlog']; ?></a></td>
-		<td><?php echo $LANG['Main_viewlog']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="logout.php"><?php echo $LANG['Menu_logout']; ?></a></td>
-		<td><?php echo $LANG['Main_logout']; ?></td>
-	</tr>
-</table>
-</div>
diff --git a/templates/users_main.tpl b/templates/users_main.tpl
deleted file mode 100644
index 94f1907..0000000
--- a/templates/users_main.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div id="main_menu">
-<table>
-	<tr>
-		<td>&nbsp;</td>
-		<td><?php echo $_SESSION['userid']['username']; ?></td>
-	</tr>
-	<?php if (VACATION == 'YES') { ?>
-	<tr>
-		<td nowrap><a target="_top" href="vacation.php"><?php echo $LANG['UsersMenu_vacation']; ?></a></td>
-		<td><?php echo $LANG['UsersMain_vacation']; ?></td>
-	</tr>
-	<?php } ?>
-	<tr>
-		<td nowrap><a target="_top" href="password.php"><?php echo $LANG['UsersMenu_password']; ?></a></td>
-		<td><?php echo $LANG['UsersMain_password']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="logout.php"><?php echo $LANG['Menu_logout']; ?></a></td>
-		<td><?php echo $LANG['Main_logout']; ?></td>
-	</tr>
-</table>
-</div>
diff --git a/templates/users_menu.tpl b/templates/users_menu.tpl
index d71d781..c599a2d 100644
--- a/templates/users_menu.tpl
+++ b/templates/users_menu.tpl
@@ -1,9 +1,9 @@
 <div id="menu">
 <ul>
+	<li><a target="_top" href="password.php"><?php echo $LANG['UsersMenu_password']; ?></a></li>
 	<?php if (VACATION == "YES") { ?>
 	<li><a target="_top" href="vacation.php"><?php echo $LANG['UsersMenu_vacation']; ?></a></li>
 	<?php } ?>
-	<li><a target="_top" href="password.php"><?php echo $LANG['UsersMenu_password']; ?></a></li>
 	<li><a target="_top" href="logout.php"><?php echo $LANG['Menu_logout']; ?></a></li>
 </ul>
 </div>
diff --git a/users/login.php b/users/login.php
index f1fe900..d940d52 100644
--- a/users/login.php
+++ b/users/login.php
@@ -45,7 +45,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 	if (empty($message)) {
 		session_start();
 		$_SESSION['userid']['username'] = $username;
-		header("Location: main.php");
+		header("Location: password.php");
 		exit;
 	}
 } 
diff --git a/users/main.php b/users/main.php
deleted file mode 100644
index e7bc2ec..0000000
--- a/users/main.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// 
-// OpenSMTPD Admin 
-// by Mischa Peters <mischa at high5 dot nl>
-// Copyright (c) 2022 High5!
-// License Info: LICENSE.TXT
-//
-// File: main.php
-//
-// Template File: main.tpl
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST / GET Variables:
-//
-// -none-
-//
-require_once '../functions.inc.php';
-
-include '../languages/' . check_language() . '.lang';
-
-$SESSID_USERNAME = check_session('userid');
-
-include '../templates/header.tpl';
-include '../templates/users_menu.tpl';
-include '../templates/users_main.tpl';
-include '../templates/footer.tpl';
-?>