diff --git a/includes/login_form.inc b/includes/login_form.inc
index a0c8427..77103c4 100644
--- a/includes/login_form.inc
+++ b/includes/login_form.inc
@@ -1,4 +1,4 @@
-<form action="login.php" method="post">
+<form action="<?php echo $_SERVER[REQUEST_URI]; ?>" method="post">
 <input type="hidden" name="do" value="authenticate">
 
 <table border=0>
diff --git a/user/login.php b/user/login.php
deleted file mode 100644
index c5993a9..0000000
--- a/user/login.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<head>
-<title>Login</title>
-</head>
-<?php 
-if ( $_POST['do'] == "authenticate") {
-#	require "../includes/config.php";
-	require "../includes/dbconnect.php";
-
-	$sql = "SELECT id FROM users WHERE username='$_POST[username]' and password=PASSWORD('$_POST[password]')";
-	$result = mysql_query($sql) or die (mysql_error());
-
-	echo mysql_num_rows($result);
-
-	if (mysql_num_rows($result) == 1) {
-		echo "<p>You are a valid user!<br />";
-		echo "Your username is $_POST[username]<br />";
-		echo "Your password is $_POST[password]</p>";
-		include("login_form.inc");
-	} else {
-		unset($_POST['do']);
-		echo "<p>You are not authorized. Please try again.</p>";
-		include("login_form.inc");
-	}
-
-	break;
-} else {
-	include("login_form.inc");
-}
-?>
-</body>
-</html>
diff --git a/user/login_form.inc b/user/login_form.inc
deleted file mode 100644
index a0c8427..0000000
--- a/user/login_form.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<form action="login.php" method="post">
-<input type="hidden" name="do" value="authenticate">
-
-<table border=0>
-<tr>
-	<td><strong>Username</strong></td>
-	<td><input type="text" name="username" size="20" maxlength="20"></td>
-</tr>
-<tr>
-        <td><strong>Password</strong></td>
-        <td><input type="text" name="password" size="20" maxlength="20"></td>
-</tr>
-<tr>
-        <td colspan=2 align="center"><input type="submit" value="Login"></td>
-</tr>
-</table>
diff --git a/user/new.php b/user/new.php
index e07f446..54f8c3c 100644
--- a/user/new.php
+++ b/user/new.php
@@ -1,6 +1,7 @@
 <?php
 require "../includes/htmlcode.php";
 start_html("Create new post");
+include "../includes/login.inc";
 ?>
 
 <h1>Create new post</h1>
