diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 17260d05f..44fa2d50f 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -357,7 +357,7 @@ sub www_editUserSave {
 	return WebGUI::Privilege::adminOnly() unless ($isAdmin || $isSecondary);
 	my ($uid) = WebGUI::SQL->quickArray("select userId from users where username=".quote($session{form}{username}));
 	my $error;
-	if ($uid eq $session{form}{uid} || $uid eq "" || $session{form}{username} ne "") {
+	if (($uid eq $session{form}{uid} || $uid eq "") && $session{form}{username} ne '') {
 	   	my $u = WebGUI::User->new($session{form}{uid});
 		$session{form}{uid} = $u->userId unless ($isSecondary);
 	   	$u->username($session{form}{username});
@@ -366,7 +366,7 @@ sub www_editUserSave {
 	   	foreach (@{$session{config}{authMethods}}) {
 	      		my $authInstance = WebGUI::Operation::Auth::getInstance($_,$u->userId);
 	      		$authInstance->editUserFormSave;
-       		}	
+       		}
 		my %field;
       		tie %field, 'Tie::CPHash';
       		my $a = WebGUI::SQL->read("select fieldName,dataType from userProfileField");