diff --git a/op/op.Login.php b/op/op.Login.php
index 88b4af57c..21c6ba730 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -86,12 +86,13 @@ else if (isset($_GET["referuri"]) && strlen($_GET["referuri"])>0) {
 add_log_line();
 
 $controller->setParam('login', $login);
-$controller->setParam('logininfo', $_POST['logininfo'] ? $_POST['logininfo'] : '');
+$controller->setParam('logininfo', !empty($_POST['logininfo']) ? $_POST['logininfo'] : '');
 $controller->setParam('pwd', $pwd);
 $controller->setParam('lang', $lang);
 $controller->setParam('sesstheme', $sesstheme);
 $controller->setParam('session', $session);
-switch($_POST['action']) {
+$action = !empty($_POST['action']) ? $_POST['action'] : '';
+switch($action) {
 case 'preparelogin':
 	$controller->preparelogin();
 	exit();