-#define FLAGS_OPER 0x0001 /* Operator +O */
-#define FLAGS_LOCOP 0x0002 /* Local operator +o */
-#define FLAGS_INVISIBLE 0x0004 /* invisible +i */
-#define FLAGS_WALLOP 0x0008 /* receives wallops +w */
-#define FLAGS_SERVNOTICE 0x0010 /* receives server notices +s */
-#define FLAGS_DEAF 0x0020 /* deaf +d */
-#define FLAGS_SERVICE 0x0040 /* cannot be kicked, killed or deoped +k */
-#define FLAGS_GLOBAL 0x0080 /* receives global messages +g */
-
-// sethost - reed/apples
-// #define FLAGS_HELPER 0x0100 /* (network?) helper +h */
-#define FLAGS_SETHOST 0x0100 /* sethost +h */
-
-#define FLAGS_PERSISTENT 0x0200 /* for reserved nicks, this isn't just one-shot */
-#define FLAGS_GAGGED 0x0400 /* for gagged users */
-#define FLAGS_AWAY 0x0800 /* for away users */
-#define FLAGS_STAMPED 0x1000 /* for users who have been stamped */
-#define FLAGS_HIDDEN_HOST 0x2000 /* user's host is masked by their account */
-#define FLAGS_REGNICK 0x4000 /* user owns their current nick */
-#define FLAGS_REGISTERING 0x8000 /* user has issued account register command, is waiting for email cookie */
+#define FLAGS_OPER 0x00000001 /* Operator +o */
+#define FLAGS_LOCOP 0x00000002 /* Local operator +O */
+#define FLAGS_INVISIBLE 0x00000004 /* invisible +i */
+#define FLAGS_WALLOP 0x00000008 /* receives wallops +w */
+#define FLAGS_DUMMY 0x00000010 /* user is not announced to other servers */
+#define FLAGS_DEAF 0x00000020 /* deaf +d */
+#define FLAGS_SERVICE 0x00000040 /* cannot be kicked, killed or deoped +k */
+#define FLAGS_GLOBAL 0x00000080 /* receives global messages +g */
+#define FLAGS_SETHOST 0x00000100 /* sethost +h */
+#define FLAGS_PERSISTENT 0x00000200 /* for reserved nicks, this isn't just one-shot */
+#define FLAGS_GAGGED 0x00000400 /* for gagged users */
+#define FLAGS_AWAY 0x00000800 /* for away users */
+#define FLAGS_STAMPED 0x00001000 /* for users who have been stamped */
+#define FLAGS_HIDDEN_HOST 0x00002000 /* user's host is masked by their account +x */
+#define FLAGS_REGNICK 0x00004000 /* user owns their current nick */
+#define FLAGS_REGISTERING 0x00008000 /* user has issued account register command, is waiting for email cookie */
+#define FLAGS_BOT 0x00010000 /* Bot +B */
+#define FLAGS_HIDECHANS 0x00020000 /* Hidden channels +n */
+#define FLAGS_HIDEIDLE 0x00040000 /* Hidden idle time +I */
+#define FLAGS_XTRAOP 0x00080000 /* user is XtraOP +X */
+#define FLAGS_CLOAKHOST 0x00100000 /* user has cloaked host +C */
+#define FLAGS_CLOAKIP 0x00200000 /* user has cloaked ip +c */
+#define FLAGS_ADMIN 0x00400000 /* Admin +a */
+#define FLAGS_SSL 0x00800000 /* user is using a secure connection +z */
+#define FLAGS_PRIVDEAF 0x01000000 /* user is deaf to private messages +D */
+#define FLAGS_ACCOUNTONLY 0x02000000 /* user only receives PMs from authed users +R */
+#define FLAGS_WHOIS 0x04000000 /* user receives notices when /whois'ed +W */
+#define FLAGS_HIDEOPER 0x08000000 /* user is a hidden IRCop +H */
+#define FLAGS_NOLINK 0x10000000 /* user has opted out of channel redirection +L */
+#define FLAGS_COMMONCHANSONLY 0x20000000 /* user only receives PMs from users on same cahnnels +q */