diff --git a/config/bash_completion.d/ee_auto.rc b/config/bash_completion.d/ee_auto.rc
index 2e936e1c..3241994d 100644
--- a/config/bash_completion.d/ee_auto.rc
+++ b/config/bash_completion.d/ee_auto.rc
@@ -66,11 +66,16 @@ _ee_complete()
     elif [ $COMP_CWORD -eq 3 ]; then
         case "$prev" in
             # HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE
-            "install" | "purge" | "remove" | "start" | "stop" | "reload")
+            "install" | "purge" | "remove" )
                 COMPREPLY=( $(compgen \
                               -W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot" \
                               -- $cur) )
                 ;;
+            "start" | "stop" | "reload" | "restart" | "status")
+                COMPREPLY=( $(compgen \
+                              -W "--nginx --php --mysql --postfix --memcache --dovecot" \
+                              -- $cur) )
+                ;;
 
             "list")
                 COMPREPLY=( $(compgen \