diff --git a/app/devices/device_dashboard.php b/app/devices/device_dashboard.php
index b2d4dc7901..37b96aa398 100644
--- a/app/devices/device_dashboard.php
+++ b/app/devices/device_dashboard.php
@@ -75,7 +75,7 @@
 
 				//validate the token
 					$token = new token;
-					if (!$token->validate('/app/devices/device_dashboard.php')) {
+					if (!$token->validate('/app/devices/device_dashboard.php') && !$token->validate('login')) {
 						message::add($text['message-invalid_token'],'negative');
 						header('Location: '.PROJECT_PATH."/core/user_settings/user_dashboard.php");
 						exit;
diff --git a/resources/login.php b/resources/login.php
index 22e1a18eaf..d8c0b0019d 100644
--- a/resources/login.php
+++ b/resources/login.php
@@ -234,6 +234,10 @@
 
 	if (!$password_reset) {
 
+		//create token
+			$object = new token;
+			$token = $object->create('login');
+
 		echo "<div id='login_form'>\n";
 		echo "<form name='login' method='post' action='".$_SESSION['login']['destination']['url']."'>\n";
 		echo "<input type='text' class='txt login' style='text-align: center; min-width: 200px; width: 200px; margin-bottom: 8px;' name='username' id='username' placeholder=\"".$text['label-username']."\"><br />\n";
@@ -262,6 +266,7 @@
 			) {
 			echo "<br><br><a class='login_link' onclick=\"toggle_password_reset('login_form','request_form','email');\">".$text['label-reset_password']."</a>";
 		}
+		echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 		echo "</form>";
 		echo "<script>$('#username').trigger('focus');</script>";
 		echo "</div>";
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000000..1f53798bb4
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /