diff --git a/functions.php b/functions.php
index d1e7addb0..f652cfe39 100644
--- a/functions.php
+++ b/functions.php
@@ -1813,7 +1813,7 @@
 
 			$remote_user = get_remote_user($link);
 
-			if ($remote_user && $login != "admin") {
+			if ($remote_user && $remote_user == $login && $login != "admin") {
 
 				$login = $remote_user;