diff --git a/Chanban/chanban.tcl b/Chanban/chanban.tcl
index ace48f9..fbe6656 100644
--- a/Chanban/chanban.tcl
+++ b/Chanban/chanban.tcl
@@ -106,16 +106,19 @@ namespace eval cmgmt {
     proc abans {nick uhost hand chan mode target} {
         set hostmask [maskhost ${nick}![getchanhost $nick $chan] 2]
         set banReason "$::cmgmt::banReason \(auto-added\)"
-        if {$mode eq "+b" && [channel get $chan addBans]} {
-            if {$nick ne $::botnick && $nick ni $::cmgmt::noAddNicks && $hostmask ni $::cmgmt::noAddMasks} {
-                if {[matchstr "~*" $target] && ![isban $target $chan]} {
-                    newchanban $chan $target $nick $banReason 0 sticky
-                    return 0
-                } else {
-                    newchanban $chan $target $nick $banReason 0
-                    putserv "PRIVMSG $chan :$target auto-added to ${chan}'s ban list."
-                    return 0
-                }
+
+        if {$mode eq "+b" && ![channel get $chan addBans]} {
+            return 0
+        }
+
+        if {$nick ne $::botnick && $nick ni $::cmgmt::noAddNicks && $hostmask ni $::cmgmt::noAddMasks} {
+            if {[matchstr "~*" $target] && ![isban $target $chan]} {
+                newchanban $chan $target $nick $banReason 0 sticky
+                return 0
+            } else {
+                newchanban $chan $target $nick $banReason 0
+                putserv "PRIVMSG $chan :$target auto-added to ${chan}'s ban list."
+                return 0
             }
         }
         return 0
@@ -123,16 +126,18 @@ namespace eval cmgmt {
 
     # We also need to deal with the removal of extbans, since we don't deal with them internally
     proc rabans {nick uhost hand chan mode target} {
-        if {$mode eq "-b" && [channel get $chan addBans]} {
-            if {$nick ne $::botnick && [isban $target $chan]} {
-                if {[matchstr "~*" $target]} {
-                    killchanban $chan $target
-                    return 0
-                } else {
-                    killchanban $chan $target
-                    putserv "PRIVMSG $chan :$target auto-removed from ${chan}'s ban list."
-                    return 0
-                }
+        if {$mode eq "-b" && ![channel get $chan addBans]} {
+            return 0
+        }
+
+        if {$nick ne $::botnick && [isban $target $chan]} {
+            if {[matchstr "~*" $target]} {
+                killchanban $chan $target
+                return 0
+            } else {
+                killchanban $chan $target
+                putserv "PRIVMSG $chan :$target auto-removed from ${chan}'s ban list."
+                return 0
             }
         }
         return 0