diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index abed551..6ce61dd 100644
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -777,7 +777,7 @@ will add 1.2.3.0/24 for both IPv4 and IPv6 requestors.
 .TP
 .B --strip-subnet
 Remove any subnet address already present in a downstream query before forwarding it upstream. If --add-subnet is set this also
-ensures that any downstream-provided subnet is replaced by the one added by dnsmasq. Otherwise, dnsmaaq will NOT replace an
+ensures that any downstream-provided subnet is replaced by the one added by dnsmasq. Otherwise, dnsmasq will NOT replace an
 existing subnet in the query.
 .TP
 .B --umbrella[=[deviceid:<deviceid>][,orgid:<orgid>][,assetid:<id>]]
diff --git a/src/option.c b/src/option.c
index 7133a30..fded28e 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2537,13 +2537,13 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
 	      arg += 9;
 	      if (strlen(arg) != 16)
 		ret_err(gen_err);
-         
+	      
 	      for (p = arg; *p; p++)
 		if (!isxdigit((int)*p))
 		  ret_err(gen_err);
-          
+	      
 	      set_option_bool(OPT_UMBRELLA_DEVID);
-	   	      
+	      
 	      for (i = 0; i < (int)sizeof(daemon->umbrella_device); i++, arg+=2)
 		{
 		  memcpy(word, &(arg[0]), 2);
@@ -2555,13 +2555,13 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
 	      if (!strtoul_check(arg+6, &daemon->umbrella_org))
 		ret_err(gen_err);
 	    }
-        else if (strstr(arg, "assetid:"))
-	  {
-	    if (!strtoul_check(arg+8, &daemon->umbrella_asset))
-	      ret_err(gen_err);
-	  }
-	else
-	  ret_err(gen_err);
+	  else if (strstr(arg, "assetid:"))
+	    {
+	      if (!strtoul_check(arg+8, &daemon->umbrella_asset))
+		ret_err(gen_err);
+	    }
+	  else
+	    ret_err(gen_err);
 	  
 	  arg = comma;
 	}