diff --git a/lib/util.php b/lib/util.php
index 622a42982c3682667d0f49273d867e8418f27e09..c4ed1f6ba7ce64e59ca812bdea6ec218e7c2c607 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -340,8 +340,8 @@ class OC_Util {
 		}
 		if (isset($_REQUEST['redirect_url'])) {
 			$redirect_url = OC_Util::sanitizeHTML($_REQUEST['redirect_url']);
+			$parameters['redirect_url'] = urlencode($redirect_url);
 		} 
-		$parameters['redirect_url'] = urlencode($redirect_url);
 		OC_Template::printGuestPage("", "login", $parameters);
 	}