diff --git a/files/akb.netz/homedirs/DEFAULT/_profile b/files/akb.netz/homedirs/DEFAULT/_profile
index 6a5a4d2..2d05d4c 100644
--- a/files/akb.netz/homedirs/DEFAULT/_profile
+++ b/files/akb.netz/homedirs/DEFAULT/_profile
@@ -21,6 +21,11 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
diff --git a/files/akb.netz/homedirs/DEFAULT/_profile.j2 b/files/akb.netz/homedirs/DEFAULT/_profile.j2
index fa85a4c..c11c9be 100644
--- a/files/akb.netz/homedirs/DEFAULT/_profile.j2
+++ b/files/akb.netz/homedirs/DEFAULT/_profile.j2
@@ -23,14 +23,19 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-#. /usr/lib/mc/bin/mc.sh
-#
-if [ -f "/usr/share/mc/bin/mc.sh" ] ; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
 export LANG="de_DE.utf8"
diff --git a/files/akb.netz/homedirs/chris/_profile b/files/akb.netz/homedirs/chris/_profile
index 71115e9..9169811 100644
--- a/files/akb.netz/homedirs/chris/_profile
+++ b/files/akb.netz/homedirs/chris/_profile
@@ -21,6 +21,11 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
diff --git a/files/akb.netz/homedirs/root/_profile b/files/akb.netz/homedirs/root/_profile
index d9530af..0664b2f 100644
--- a/files/akb.netz/homedirs/root/_profile
+++ b/files/akb.netz/homedirs/root/_profile
@@ -35,4 +35,6 @@ elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
    source /usr/lib/mc/bin/mc.sh
 fi
 
-mesg n
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/akb.netz/homedirs/sysadm/_profile b/files/akb.netz/homedirs/sysadm/_profile
index 1a97c71..8678560 100644
--- a/files/akb.netz/homedirs/sysadm/_profile
+++ b/files/akb.netz/homedirs/sysadm/_profile
@@ -18,7 +18,12 @@ fi
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-# . /usr/lib/mc/bin/mc.sh
-. /usr/share/mc/bin/mc.sh
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
+   source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
+fi
 
-mesg n
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/anw-kb.netz/homedirs/DEFAULT/_profile b/files/anw-kb.netz/homedirs/DEFAULT/_profile
index 6a5a4d2..b885ffc 100644
--- a/files/anw-kb.netz/homedirs/DEFAULT/_profile
+++ b/files/anw-kb.netz/homedirs/DEFAULT/_profile
@@ -25,7 +25,8 @@ fi
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-if [[ -f /usr/share/mc/bin/mc.sh ]]; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
-
diff --git a/files/anw-kb.netz/homedirs/DEFAULT/_profile.j2 b/files/anw-kb.netz/homedirs/DEFAULT/_profile.j2
index fa85a4c..c11c9be 100644
--- a/files/anw-kb.netz/homedirs/DEFAULT/_profile.j2
+++ b/files/anw-kb.netz/homedirs/DEFAULT/_profile.j2
@@ -23,14 +23,19 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-#. /usr/lib/mc/bin/mc.sh
-#
-if [ -f "/usr/share/mc/bin/mc.sh" ] ; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
 export LANG="de_DE.utf8"
diff --git a/files/anw-kb.netz/homedirs/root/_profile b/files/anw-kb.netz/homedirs/root/_profile
index 6a5a4d2..3c9fd98 100644
--- a/files/anw-kb.netz/homedirs/root/_profile
+++ b/files/anw-kb.netz/homedirs/root/_profile
@@ -25,7 +25,12 @@ fi
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-if [[ -f /usr/share/mc/bin/mc.sh ]]; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/anw-kb.netz/homedirs/sysadm/_profile b/files/anw-kb.netz/homedirs/sysadm/_profile
index e3a8813..8678560 100644
--- a/files/anw-kb.netz/homedirs/sysadm/_profile
+++ b/files/anw-kb.netz/homedirs/sysadm/_profile
@@ -18,8 +18,12 @@ fi
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-if [[ -f /usr/share/mc/bin/mc.sh ]]; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
-mesg n
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/flr.netz/homedirs/DEFAULT/_profile b/files/flr.netz/homedirs/DEFAULT/_profile
index 6a5a4d2..3c9fd98 100644
--- a/files/flr.netz/homedirs/DEFAULT/_profile
+++ b/files/flr.netz/homedirs/DEFAULT/_profile
@@ -25,7 +25,12 @@ fi
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-if [[ -f /usr/share/mc/bin/mc.sh ]]; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/flr.netz/homedirs/DEFAULT/_profile.j2 b/files/flr.netz/homedirs/DEFAULT/_profile.j2
index fa85a4c..c11c9be 100644
--- a/files/flr.netz/homedirs/DEFAULT/_profile.j2
+++ b/files/flr.netz/homedirs/DEFAULT/_profile.j2
@@ -23,14 +23,19 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-#. /usr/lib/mc/bin/mc.sh
-#
-if [ -f "/usr/share/mc/bin/mc.sh" ] ; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
 export LANG="de_DE.utf8"
diff --git a/files/flr.netz/homedirs/chris/_profile b/files/flr.netz/homedirs/chris/_profile
index 71115e9..9169811 100644
--- a/files/flr.netz/homedirs/chris/_profile
+++ b/files/flr.netz/homedirs/chris/_profile
@@ -21,6 +21,11 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
diff --git a/files/flr.netz/homedirs/root/_profile b/files/flr.netz/homedirs/root/_profile
index d9530af..0664b2f 100644
--- a/files/flr.netz/homedirs/root/_profile
+++ b/files/flr.netz/homedirs/root/_profile
@@ -35,4 +35,6 @@ elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
    source /usr/lib/mc/bin/mc.sh
 fi
 
-mesg n
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/flr.netz/homedirs/sysadm/_profile b/files/flr.netz/homedirs/sysadm/_profile
index 1a97c71..8678560 100644
--- a/files/flr.netz/homedirs/sysadm/_profile
+++ b/files/flr.netz/homedirs/sysadm/_profile
@@ -18,7 +18,12 @@ fi
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-# . /usr/lib/mc/bin/mc.sh
-. /usr/share/mc/bin/mc.sh
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
+   source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
+fi
 
-mesg n
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/mbr-bln.netz/homedirs/DEFAULT/_profile b/files/mbr-bln.netz/homedirs/DEFAULT/_profile
index 6a5a4d2..9169811 100644
--- a/files/mbr-bln.netz/homedirs/DEFAULT/_profile
+++ b/files/mbr-bln.netz/homedirs/DEFAULT/_profile
@@ -21,11 +21,18 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-if [[ -f /usr/share/mc/bin/mc.sh ]]; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
diff --git a/files/mbr-bln.netz/homedirs/DEFAULT/_profile.j2 b/files/mbr-bln.netz/homedirs/DEFAULT/_profile.j2
index 4f9481c..166c675 100644
--- a/files/mbr-bln.netz/homedirs/DEFAULT/_profile.j2
+++ b/files/mbr-bln.netz/homedirs/DEFAULT/_profile.j2
@@ -23,14 +23,19 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-#. /usr/lib/mc/bin/mc.sh
-#
-if [ -f "/usr/share/mc/bin/mc.sh" ] ; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
 export LANG="de_DE.utf8"
diff --git a/files/mbr-bln.netz/homedirs/root/_profile b/files/mbr-bln.netz/homedirs/root/_profile
index d9530af..0664b2f 100644
--- a/files/mbr-bln.netz/homedirs/root/_profile
+++ b/files/mbr-bln.netz/homedirs/root/_profile
@@ -35,4 +35,6 @@ elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
    source /usr/lib/mc/bin/mc.sh
 fi
 
-mesg n
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/sprachenatelier.netz/homedirs/DEFAULT/_profile b/files/sprachenatelier.netz/homedirs/DEFAULT/_profile
index 6a5a4d2..ce5f29f 100644
--- a/files/sprachenatelier.netz/homedirs/DEFAULT/_profile
+++ b/files/sprachenatelier.netz/homedirs/DEFAULT/_profile
@@ -21,11 +21,17 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-if [[ -f /usr/share/mc/bin/mc.sh ]]; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
-
diff --git a/files/sprachenatelier.netz/homedirs/DEFAULT/_profile.j2 b/files/sprachenatelier.netz/homedirs/DEFAULT/_profile.j2
index 6604944..e0773a6 100644
--- a/files/sprachenatelier.netz/homedirs/DEFAULT/_profile.j2
+++ b/files/sprachenatelier.netz/homedirs/DEFAULT/_profile.j2
@@ -23,14 +23,19 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-#. /usr/lib/mc/bin/mc.sh
-#
-if [ -f "/usr/share/mc/bin/mc.sh" ] ; then
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
    source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
 fi
 
 export LANG="de_DE.utf8"
diff --git a/files/sprachenatelier.netz/homedirs/back/_profile b/files/sprachenatelier.netz/homedirs/back/_profile
index edc7a33..c232aca 100644
--- a/files/sprachenatelier.netz/homedirs/back/_profile
+++ b/files/sprachenatelier.netz/homedirs/back/_profile
@@ -17,14 +17,17 @@ if [ -n "$BASH_VERSION" ]; then
 fi
 
 # set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
 fi
 
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-#. /usr/lib/mc/bin/mc.sh
-. /usr/share/mc/bin/mc.sh
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
+   source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
+fi
 
diff --git a/files/sprachenatelier.netz/homedirs/chris/_profile b/files/sprachenatelier.netz/homedirs/chris/_profile
index 71115e9..9169811 100644
--- a/files/sprachenatelier.netz/homedirs/chris/_profile
+++ b/files/sprachenatelier.netz/homedirs/chris/_profile
@@ -21,6 +21,11 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
diff --git a/files/sprachenatelier.netz/homedirs/root/_profile b/files/sprachenatelier.netz/homedirs/root/_profile
index d9530af..0664b2f 100644
--- a/files/sprachenatelier.netz/homedirs/root/_profile
+++ b/files/sprachenatelier.netz/homedirs/root/_profile
@@ -35,4 +35,6 @@ elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
    source /usr/lib/mc/bin/mc.sh
 fi
 
-mesg n
+if command -v mesg >/dev/null 2>&1; then
+    mesg n
+fi
diff --git a/files/sprachenatelier.netz/homedirs/sysadm/_profile b/files/sprachenatelier.netz/homedirs/sysadm/_profile
index 1a97c71..9a5ee68 100644
--- a/files/sprachenatelier.netz/homedirs/sysadm/_profile
+++ b/files/sprachenatelier.netz/homedirs/sysadm/_profile
@@ -10,15 +10,18 @@ fi
 if [ -d "$HOME/bin" ] ; then
    PATH="$HOME/bin:$PATH"
 fi
-if [ -d "$HOME/bin/admin-stuff" ] ; then
-   PATH="$HOME/bin/admin-stuff:$PATH"
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
 fi
 
 # this is for the midnight-commander
 # to become the last directory the midnight commander was in
 # as the current directory when leaving the midnight commander
 #
-# . /usr/lib/mc/bin/mc.sh
-. /usr/share/mc/bin/mc.sh
-
-mesg n
+if [ -f "/usr/share/mc/bin/mc.sh" ]; then
+   source /usr/share/mc/bin/mc.sh
+elif [ -f "/usr/lib/mc/bin/mc.sh" ] ; then
+   source /usr/lib/mc/bin/mc.sh
+fi