diff --git a/dokku b/dokku
index c27cf7f34..509310d50 100755
--- a/dokku
+++ b/dokku
@@ -7,7 +7,7 @@ export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
 
 [[ $DOKKU_TRACE ]] && set -x
 
-if [[ $(id -un) != "dokku" && $1 != "plugins-install" ]]; then
+if [[ $(id -un) != "dokku" && $1 != plugins-install* ]]; then
   sudo -u dokku -H $0 "$@"
   exit
 fi
@@ -95,9 +95,9 @@ case "$1" in
 
   cleanup)
     # delete all non-running container
-    docker ps -a | grep 'Exit' |  awk '{print $1}' | xargs docker rm &> /dev/null &
+    docker ps -a | grep 'Exit' | awk '{print $1}' | xargs docker rm &> /dev/null &
     # delete unused images
-    docker images | grep '<none>' |  awk '{print $3}'  | xargs docker rmi &> /dev/null &
+    docker images | grep '<none>' | awk '{print $3}' | xargs docker rmi &> /dev/null &
     ;;
 
   plugins)