diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 329c0d28cfb..a00c8ca2c88 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -3,9 +3,9 @@ require_once( "LinksUpdate.php" );
 
 function wfSpecialMovepage()
 {
-	global $wgUser, $wgOut, $wgRequest, $action;
+	global $wgUser, $wgOut, $wgRequest, $action, $wgOnlySysopMayMove;
 
-	if ( 0 == $wgUser->getID() or $wgUser->isBlocked() ) {
+	if ( 0 == $wgUser->getID() or $wgUser->isBlocked() or ($wgOnlySysopMayMove and $wgUser->isNewbie())) {
 		$wgOut->errorpage( "movenologin", "movenologintext" );
 		return;
 	}
diff --git a/includes/User.php b/includes/User.php
index 2a06936a04a..322ae18dd84 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -722,7 +722,7 @@ class User {
 	}
 
 	function isNewbie() {
-		return $this->mId > User::getMaxID() * 0.99 && !$this->isSysop() || $this->getID() == 0;
+		return $this->mId > User::getMaxID() * 0.99 && !$this->isSysop() && !$this->isBot() || $this->getID() == 0;
 	}
 }