diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user
index 42bcf65f5..3ab9ae6a2 100755
--- a/salt/common/tools/sbin/so-user
+++ b/salt/common/tools/sbin/so-user
@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-. /usr/sbin/so-common
+source $(dirname $0)/so-common
 
 if [[ $# -lt 1 || $# -gt 2 ]]; then
   echo "Usage: $0 <list|add|update|enable|disable|validate|valemail|valpass> [email]"
diff --git a/setup/so-functions b/setup/so-functions
index b36cd1537..642ae5004 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2040,7 +2040,7 @@ set_updates() {
 	fi
 }
 
-set_version() {
+mark_version() {
 	# Drop a file with the current version
 	echo "$SOVERSION" > /etc/soversion
 }
diff --git a/setup/so-setup b/setup/so-setup
index fe69e8148..21c78cd92 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -454,7 +454,7 @@ if [[ $is_minion ]]; then
 fi
 
 {
-	set_version;
+	mark_version;
 	clear_manager;
 } >> $setup_log 2>&1