diff --git a/install b/install
index acb01ee..1e02cf7 100755
--- a/install
+++ b/install
@@ -7,6 +7,10 @@ function error {
 
 cd $HOME
 
+if [[ "$(id -u)" == 0 ]]; then
+	error "Pi-Apps is not designed to be installed as root! Please try again as a regular user."
+fi
+
 DIRECTORY="$(readlink -f "$(dirname "$0")")"
 
 #install yad automatically
diff --git a/manage b/manage
index 8657ad6..2e73d45 100755
--- a/manage
+++ b/manage
@@ -355,5 +355,5 @@ elif [ "$1" == 'update-all' ];then
   IFS="$PREIFS"
   echo -e '\e[92mOperation completed successfully!\e[39m'
 else
-  error "Did not understand $1. Allowed values: 'install', 'install-if-not-installed', 'multi-install', 'multi-uninstall', 'update', 'check-all', or 'update-all'."
+  error "Did not understand $1. Allowed values: 'install', 'multi-install', 'install-if-not-installed', 'uninstall', 'multi-uninstall', 'update','update-all', or 'check-all'."
 fi