diff --git a/install b/install
index cfc4e8b..7bffd0f 100755
--- a/install
+++ b/install
@@ -29,12 +29,14 @@ install() {
     if [ $? -ne 0 ]
         then
             echo "alias dm='sudo clidmanager'" >> ~/.bashrc
+    fi        
     exists=$(grep -i "alias clidmanager='sudo clidmanager'" ~/.bashrc)        
-    elif [ $? -ne 0 ]
+    if [ $? -ne 0 ]
         then
             echo "alias clidmanager='sudo clidmanager'" >> ~/.bashrc
+    fi        
     exists=$(grep -i "alias dw='source docker_work'" ~/.bashrc)
-    elif [ $? -ne 0 ]
+    if [ $? -ne 0 ]
         then
             echo "alias dw='source docker_work'" >> ~/.bashrc 
     fi              
@@ -50,6 +52,10 @@ install() {
             exit 0
     else        
         sudo cp -f clidmanager docker_work /usr/local/bin/ && sudo mv no_pwd_clidmanager /etc/sudoers.d/
+        if [ -z $isgroup ]
+            then
+                sudo usermod -aG docker $USER
+        fi
         echo
         echo "clidmanager intalliert."
         echo
@@ -61,21 +67,25 @@ install() {
         echo
 
         read -p "Enter zum beenden drücken..."
-
+    fi
 }
 
 remove() {
 
-    sed -i -e /"alias dm='sudo clidmanager'"/d ~/.bashrc && \
-    sed -i -e /"alias clidmanager='sudo clidmanager'"/d ~/.bashrc && \
-    sed -i -e /"alias dw='source docker_work'"/d ~/.bashrc 
-    sudo rm -f /usr/local/bin/clidmanager docker_work && sudo rm /etc/sudoers.d/no_pwd_clidmanager
-    sudo usermod -rG docker $USER
-    echo
-    echo "clidmanager deintalliert."
-    echo
-    read -p "Enter zum beenden drücken..."
-
+    sudo rm -f /usr/local/bin/clidmanager /usr/local/bin/docker_work && sudo rm /etc/sudoers.d/no_pwd_clidmanager
+    if [ $? -ne 0 ]
+        then
+            exit 0
+    else 
+        sudo usermod -rG docker $USER
+        sed -i -e /"alias dm='sudo clidmanager'"/d ~/.bashrc && \
+        sed -i -e /"alias clidmanager='sudo clidmanager'"/d ~/.bashrc && \
+        sed -i -e /"alias dw='source docker_work'"/d ~/.bashrc
+        echo
+        echo "clidmanager deintalliert."
+        echo
+        read -p "Enter zum beenden drücken..."
+    fi
 }
 
 which clidmanager >/dev/null
@@ -105,10 +115,6 @@ else
         exit 0
     else
         install
-        if [ -z $isgroup ]
-            then
-                sudo usermod -aG docker $USER
-        fi
     fi
 fi