diff --git a/core/templates/login.php b/core/templates/login.php
index 65f760c1ee8..a7e93a499b5 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,3 +1,5 @@
+<?php /** @var $l OC_L10N */ ?>
+
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form method="post" name="login">
 	<fieldset>
@@ -51,6 +53,7 @@
 		<label for="remember_login"><?php p($l->t('remember')); ?></label>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
+		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
 		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
 	</fieldset>
 </form>
diff --git a/lib/base.php b/lib/base.php
index 1f7d0c0da65..3ef9ce4beb2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -773,6 +773,7 @@ class OC {
 			OC_App::loadApps();
 			OC_User::setupBackends();
 			if (isset($_GET["logout"]) and ($_GET["logout"])) {
+				OC_JSON::callCheck();
 				if (isset($_COOKIE['oc_token'])) {
 					OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
 				}
@@ -939,6 +940,7 @@ class OC {
 			return false;
 		}
 
+		OC_JSON::callCheck();
 		OC_App::loadApps();
 
 		//setup extra user backends
diff --git a/lib/private/user.php b/lib/private/user.php
index 7106d664aca..21711cbf087 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -354,7 +354,7 @@ class OC_User {
 			return $backend->getLogoutAttribute();
 		}
 
-		return 'href="' . link_to('', 'index.php') . '?logout=true"';
+		return 'href="' . link_to('', 'index.php') . '?logout=true&requesttoken=' . OC_Util::callRegister() . '"';
 	}
 
 	/**