diff --git a/modules/arp_spoof.go b/modules/arp_spoof.go
index 7abb5ec0..0060fd2b 100644
--- a/modules/arp_spoof.go
+++ b/modules/arp_spoof.go
@@ -50,7 +50,13 @@ func NewArpSpoofer(s *session.Session) *ArpSpoofer {
 			return p.Start()
 		}))
 
-	p.AddHandler(session.NewModuleHandler("arp.spoof/ban off", "arp\\.(spoof|ban) off",
+	p.AddHandler(session.NewModuleHandler("arp.spoof off", "",
+		"Stop ARP spoofer.",
+		func(args []string) error {
+			return p.Stop()
+		}))
+
+	p.AddHandler(session.NewModuleHandler("arp.ban off", "",
 		"Stop ARP spoofer.",
 		func(args []string) error {
 			return p.Stop()
diff --git a/session/session.go b/session/session.go
index 990db53d..1f5a916c 100644
--- a/session/session.go
+++ b/session/session.go
@@ -187,7 +187,11 @@ func (s *Session) setupReadline() error {
 				tree[name] = []string{}
 			}
 
-			tree[name] = append(tree[name], parts[1:]...)
+			var appendedOption = strings.Join(parts[1:], " ")
+
+			if len(appendedOption) > 0 {
+				tree[name] = append(tree[name], appendedOption)
+			}
 		}
 	}