diff --git a/cmd/willow.go b/cmd/willow.go
index f4642e8365333d47b91945928746858d6fb8ec54..589c954f2108477bdd5bc0f2c291b49d024e91c4 100644
--- a/cmd/willow.go
+++ b/cmd/willow.go
@@ -83,16 +83,17 @@ func main() {
 		os.Exit(1)
 	}
 
-	if len(*flagAddUser) > 0 && len(*flagDeleteUser) == 0 && !*flagListUsers && len(*flagCheckAuthorised) == 0 {
+	switch {
+	case *flagAddUser != "":
 		createUser(dbConn, *flagAddUser)
 		os.Exit(0)
-	} else if len(*flagAddUser) == 0 && len(*flagDeleteUser) > 0 && !*flagListUsers && len(*flagCheckAuthorised) == 0 {
+	case *flagDeleteUser != "":
 		deleteUser(dbConn, *flagDeleteUser)
 		os.Exit(0)
-	} else if len(*flagAddUser) == 0 && len(*flagDeleteUser) == 0 && *flagListUsers && len(*flagCheckAuthorised) == 0 {
+	case *flagListUsers:
 		listUsers(dbConn)
 		os.Exit(0)
-	} else if len(*flagAddUser) == 0 && len(*flagDeleteUser) == 0 && !*flagListUsers && len(*flagCheckAuthorised) > 0 {
+	case *flagCheckAuthorised != "":
 		checkAuthorised(dbConn, *flagCheckAuthorised)
 		os.Exit(0)
 	}