diff --git a/classes/auth/internal.php b/classes/auth/internal.php
index 8993116c6..37014ce47 100644
--- a/classes/auth/internal.php
+++ b/classes/auth/internal.php
@@ -32,11 +32,13 @@ class Auth_Internal extends Auth_Base {
 								return false;
 							}
 						} else {
+							$return = urlencode($_REQUEST["return"]);
 							?><html>
 								<head><title>Tiny Tiny RSS</title></head>
 							<body>
-							<form method="POST">
-								<input type="hidden" name="login_action" value="do_login">
+							<form action="public.php?return=<?php echo $return ?>"
+									method="POST">
+								<input type="hidden" name="op" value="login">
 								<input type="hidden" name="login" value="<?php echo htmlspecialchars($login) ?>">
 								<input type="hidden" name="password" value="<?php echo htmlspecialchars($password) ?>">
 
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 4d6c117eb..998e078dd 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -480,8 +480,6 @@ class Handler_Public extends Handler {
 
 	function login() {
 
-		print_r($_REQUEST);
-
 		$_SESSION["prefs_cache"] = array();
 
 		if (!SINGLE_USER_MODE) {
