diff --git a/core/AdminCache.cpp b/core/AdminCache.cpp
index 2555f552..58478ad0 100644
--- a/core/AdminCache.cpp
+++ b/core/AdminCache.cpp
@@ -822,8 +822,8 @@ void AdminCache::DumpAdminCache(int cache_flags, bool rebuild)
 	}
 
 	/* If we only requested an admin rebuild, re-use the internal memory */
-	if ((cache_flags & ADMIN_CACHE_ADMINS) &&
-		!(cache_flags & ADMIN_CACHE_GROUPS))
+	if (((cache_flags & ADMIN_CACHE_ADMINS) == ADMIN_CACHE_ADMINS)
+		&& (cache_flags & (1<<2) != (1<<2)))
 	{
 		InvalidateAdminCache(true);
 	}
diff --git a/core/AdminCache.h b/core/AdminCache.h
index 704250b5..5170463d 100644
--- a/core/AdminCache.h
+++ b/core/AdminCache.h
@@ -1,4 +1,5 @@
 /**
+ * vim: set ts=4 :
  * ===============================================================
  * SourceMod (C)2004-2007 AlliedModders LLC.  All rights reserved.
  * ===============================================================
@@ -61,7 +62,7 @@ struct UserAuth
 
 struct AdminUser
 {
-	int magic;						/* Magic flag, for memory validation */
+	uint32_t magic;						/* Magic flag, for memory validation */
 	bool flags[AdminFlags_TOTAL];	/* Base flags */
 	bool eflags[AdminFlags_TOTAL];	/* Effective flags */
 	int nameidx;					/* Name index */
diff --git a/core/svn_version.h b/core/svn_version.h
index 4aee5738..d16af69f 100644
--- a/core/svn_version.h
+++ b/core/svn_version.h
@@ -3,9 +3,9 @@
 #ifndef _INCLUDE_SVN_VERSION_H_
 #define _INCLUDE_SVN_VERSION_H_
 
-#define SVN_REVISION			395
-#define SVN_REVISION_STRING	"395"
-#define SVN_FILE_VERSION		1,0,0,395
+#define SVN_REVISION			403
+#define SVN_REVISION_STRING	"403"
+#define SVN_FILE_VERSION		1,0,0,403
 
 #endif //_INCLUDE_SVN_VERSION_H_