diff --git a/Changes.lang b/Changes.lang
index bf5750f82..fb0b32afc 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -1,6 +1,7 @@
 Anope Version  S V N
 --------------------
 *** New Strings:
+	CHAN_X_INVALID
 
 *** Mod Strings:
 
diff --git a/lang/cat.l b/lang/cat.l
index a7b7c73b0..e97e9b5d6 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -1001,6 +1001,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	No estas autoritzat a estar en aquest canal.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER canal clau descripció
diff --git a/lang/de.l b/lang/de.l
index fa3e2b20f..1c891c26b 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -1014,6 +1014,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Dir ist es nicht erlaubt, diesen Channel zu betreten.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER Channel Passwort Beschreibung
diff --git a/lang/es.l b/lang/es.l
index 31fd7aced..af1c00f0d 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -1001,6 +1001,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	No estas autorizado a estar en este canal.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER canal clave descripcion
diff --git a/lang/fr.l b/lang/fr.l
index da1602499..f8b9e68d6 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -1011,6 +1011,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Vous n'êtes pas autorisé à être sur ce channel.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER canal motdepasse description
diff --git a/lang/gr.l b/lang/gr.l
index 6280fca8f..21f018503 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -999,6 +999,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Äåí Ý÷åéò ôçí Üäåéá íá åßóáé óå áõôü ôï êáíÜëé.
 	
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER channel password description
diff --git a/lang/hun.l b/lang/hun.l
index 5e0d4b7d4..7dc1ca438 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -993,6 +993,10 @@ CHAN_NOT_ALLOWED_TO_JOIN
 	Nem tartózkodhatsz ezen a csatornán.
 
 # REGISTER válaszok
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
+# REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER #szoba jelszó leírás
 CHAN_REGISTER_DISABLED
diff --git a/lang/it.l b/lang/it.l
index f920e069b..ebc33f84e 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -988,6 +988,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Non hai il permesso di stare su questo canale.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER canale password descrizione
diff --git a/lang/nl.l b/lang/nl.l
index c7d9e741c..493aa3e9f 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -996,6 +996,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Je hebt geen toestemming om op dit kanaal te zijn.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER kanaal wachtwoord beschrijving
diff --git a/lang/pl.l b/lang/pl.l
index bb2aac890..26bb8f128 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -1069,6 +1069,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Nie masz pozwolenia, aby przebywaæ na tym kanale.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER kana³ has³o opis
diff --git a/lang/pt.l b/lang/pt.l
index 63bdd2224..b9d5eac6f 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -999,6 +999,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Você não tem permissão para permanecer neste canal.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER canal senha descrição
diff --git a/lang/ru.l b/lang/ru.l
index 5eddbb9b1..23eddc8fe 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -995,6 +995,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Âàì íå ðàçðåøåíî íàõîäèòüñÿ íà ýòîì êàíàëå.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER #êàíàë ïàðîëü îïèñàíèå
diff --git a/lang/tr.l b/lang/tr.l
index 6deca3831..2701990f6 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -1005,6 +1005,10 @@ CHAN_MAY_NOT_BE_USED
 CHAN_NOT_ALLOWED_TO_JOIN
 	Bu kanalda bulunmanýza müsaade yok.
 
+# REGISTER responses
+CHAN_X_INVALID
+	Channel %s is not a valid channel.
+
 # REGISTER responses
 CHAN_REGISTER_SYNTAX
 	REGISTER kanaladý þifre açýklama
diff --git a/src/actions.c b/src/actions.c
index c9ca020a0..50ff90981 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -168,14 +168,14 @@ void common_unban(ChannelInfo * ci, char *nick)
                    for the function. but won't prevent thus from clearing out
                    the bans against an IP address since the first would fail and
                    the second would match - TSL
-                */   
+                 */
                 if (!matchfound) {
-                 if (match_userip(bans[i], u, host)) {
-                    anope_cmd_mode(whosends(ci), ci->name, "-b %s",
-                                   bans[i]);
-                    av[2] = bans[i];
-                    do_cmode(whosends(ci), 3, av);
-                 }
+                    if (match_userip(bans[i], u, host)) {
+                        anope_cmd_mode(whosends(ci), ci->name, "-b %s",
+                                       bans[i]);
+                        av[2] = bans[i];
+                        do_cmode(whosends(ci), 3, av);
+                    }
                 }
             }
             matchfound = 0;
diff --git a/src/channels.c b/src/channels.c
index b3b5e2b4e..dacf98895 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -551,9 +551,11 @@ void do_join(const char *source, int ac, char **av)
             while (c) {
                 nextc = c->next;
                 channame = sstrdup(c->chan->name);
-                send_event(EVENT_PART_CHANNEL, 3, EVENT_START, user->nick, channame);
+                send_event(EVENT_PART_CHANNEL, 3, EVENT_START, user->nick,
+                           channame);
                 chan_deluser(user, c->chan);
-                send_event(EVENT_PART_CHANNEL, 3, EVENT_STOP, user->nick, channame);
+                send_event(EVENT_PART_CHANNEL, 3, EVENT_STOP, user->nick,
+                           channame);
                 free(channame);
                 free(c);
                 c = nextc;
@@ -1111,19 +1113,19 @@ void do_cmode(const char *source, int ac, char **av)
 
     if (UseTS6 && ircd->ts6) {
         if (*av[0] == '#' || *av[0] == '&') {
-         if (debug) {
-            alog("debug: Before TS6 swap: do_cmode() chan %s : mode %s : extra %s", av[1], av[2], av[3]);
-         }
-         av[0] = (ac >= 2 ? sstrdup(av[1]) : NULL);
-         av[1] = (ac >= 3 ? sstrdup(av[2]) : NULL);
-         av[2] = (ac >= 4 ? sstrdup(av[3]) : NULL);
-         if (debug) {
-            alog("debug: After TS swap: do_cmode() chan %s : mode %s : extra %s", av[0], av[1], av[2]);
-         }
+            if (debug) {
+                alog("debug: Before TS6 swap: do_cmode() chan %s : mode %s : extra %s", av[1], av[2], av[3]);
+            }
+            av[0] = (ac >= 2 ? sstrdup(av[1]) : NULL);
+            av[1] = (ac >= 3 ? sstrdup(av[2]) : NULL);
+            av[2] = (ac >= 4 ? sstrdup(av[3]) : NULL);
+            if (debug) {
+                alog("debug: After TS swap: do_cmode() chan %s : mode %s : extra %s", av[0], av[1], av[2]);
+            }
         } else {
-         if (debug) {
-            alog("debug: TS swap not needed: do_cmode() chan %s : mode %s : extra %s", av[0], av[1], av[2]);
-         }
+            if (debug) {
+                alog("debug: TS swap not needed: do_cmode() chan %s : mode %s : extra %s", av[0], av[1], av[2]);
+            }
         }
     }
 
diff --git a/src/slist.c b/src/slist.c
index a154cc47e..0db856717 100644
--- a/src/slist.c
+++ b/src/slist.c
@@ -153,21 +153,21 @@ int slist_delete_range(SList * slist, char *range, slist_delcheckcb_t cb,
             if (!slist->list[i - 1])
                 continue;
 
-	    /* copy this off the stack for safety's sake --nenolod */
-	    VA_COPY(preserve, args);
+            /* copy this off the stack for safety's sake --nenolod */
+            VA_COPY(preserve, args);
 
             if (cb && !cb(slist, slist->list[i - 1], preserve)) {
-		va_end(preserve);
+                va_end(preserve);
                 return -1;
-	    }
+            }
 
-	    /* if it's to be freed, lets free it */
+            /* if it's to be freed, lets free it */
             if (slist->opts && slist->opts->freeitem)
                 slist->opts->freeitem(slist, slist->list[i - 1]);
             slist->list[i - 1] = NULL;
 
-	    /* and release the copied list */
-	    va_end(preserve);
+            /* and release the copied list */
+            va_end(preserve);
 
             count++;
         }
@@ -215,14 +215,14 @@ int slist_enum(SList * slist, char *range, slist_enumcb_t cb, ...)
                 continue;
             }
 
-	    /* copy off stack for safety */
-	    VA_COPY(preserve, args);
+            /* copy off stack for safety */
+            VA_COPY(preserve, args);
 
             res = cb(slist, i + 1, slist->list[i], preserve);
             if (res < 0) {
-		va_end(preserve);
+                va_end(preserve);
                 break;
-	    }
+            }
 
             /* and release our copy */
             va_end(preserve);
@@ -250,8 +250,8 @@ int slist_enum(SList * slist, char *range, slist_enumcb_t cb, ...)
                     continue;
                 }
 
-	        /* copy off stack for safety */
-	        VA_COPY(preserve, args);
+                /* copy off stack for safety */
+                VA_COPY(preserve, args);
 
                 res = cb(slist, i, slist->list[i - 1], preserve);
                 if (res < 0) {
diff --git a/src/users.c b/src/users.c
index 5d1583b25..228a3fec1 100644
--- a/src/users.c
+++ b/src/users.c
@@ -656,10 +656,9 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
         /* An old user changing nicks. */
         if (UseTS6)
             user = find_byuid(source);
-            if (!user) {
-                user = finduser(source);
-            }
-        else
+        if (!user) {
+            user = finduser(source);
+        } else
             user = finduser(source);
 
         if (!user) {
diff --git a/version.log b/version.log
index dd02c2596..0532e0b6a 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="13"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="985"
+VERSION_BUILD="986"
 
 # $Log$
 #
+# BUILD : 1.7.13 (986)
+# BUGS  : n/a
+# NOTES : Propagated CHAN_X_INVALID to all languages and Changes.lang
+#
 # BUILD : 1.7.13 (985)
 # BUGS  : 
 # NOTES : added new langstring CHAN_X_INVALID