diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 901d7513b..db1a6bbfa 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -3137,7 +3137,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             }
         }while(result->NextRow());
         // set "wpguid" column to "empty" - no visual waypoint spawned
-        WorldDatabase.PExecuteLog("UPDATE creature_movement SET wpguid = '0'");
+        WorldDatabase.PExecuteLog("UPDATE creature_movement SET wpguid = '0' WHERE wpguid <> '0'");
 
         if( hasError )
         {
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 8ede8ba91..fb2c79bce 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -4564,7 +4564,7 @@ bool ChatHandler::HandleResetAllCommand(const char * args)
         return false;
     }
 
-    CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u'",atLogin);
+    CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin);
     HashMapHolder<Player>::MapType const& plist = ObjectAccessor::Instance().GetPlayers();
     for(HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr)
         itr->second->SetAtLoginFlag(atLogin);
diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp
index 1b6929267..f5ef907bb 100644
--- a/src/mangosd/Master.cpp
+++ b/src/mangosd/Master.cpp
@@ -459,7 +459,7 @@ void Master::clearOnlineAccounts()
         "AND id IN (SELECT acctid FROM realmcharacters WHERE realmid = '%d')",realmID);
 
 
-    CharacterDatabase.Execute("UPDATE characters SET online = 0");
+    CharacterDatabase.Execute("UPDATE characters SET online = 0 WHERE online<>0");
 }
 
 /// Handle termination signals
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index a4983290a..2d7234568 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "6907"
+ #define REVISION_NR "6908"
 #endif // __REVISION_NR_H__