Index: scripts/decommission.sh
===================================================================
diff -u -rc1bdcaa3c26efb682d7bea4791021777ed28622f -r5588eb76acc074720c3c785b3b902a9e4443f5ad
--- scripts/decommission.sh	(.../decommission.sh)	(revision c1bdcaa3c26efb682d7bea4791021777ed28622f)
+++ scripts/decommission.sh	(.../decommission.sh)	(revision 5588eb76acc074720c3c785b3b902a9e4443f5ad)
@@ -167,9 +167,9 @@
 function defaultSettings() {
     local _has_error_=$FALSE
 
-    cp $LOC_SETTINGS_DFLT $LOC_SETTINGS_CONF                                                # reset the settings to default settings
+    sudo cp $LOC_SETTINGS_DFLT $LOC_SETTINGS_CONF                               # reset the settings to default settings
     _has_error_=$?
-    exitError $_has_error_ $ERR_CLEAN_SETTINGS_CONF_OVERWRITE "Service settings overwrite filed"
+    exitError $_has_error_ $ERR_CLEAN_SETTINGS_CONF_OVERWRITE "Service settings overwrite failed"
 }
 
 function deleteLogFiles() {
Index: scripts/factory_reset.sh
===================================================================
diff -u -r692e589e79748c24dee45865ec5aeccea3a79d02 -r5588eb76acc074720c3c785b3b902a9e4443f5ad
--- scripts/factory_reset.sh	(.../factory_reset.sh)	(revision 692e589e79748c24dee45865ec5aeccea3a79d02)
+++ scripts/factory_reset.sh	(.../factory_reset.sh)	(revision 5588eb76acc074720c3c785b3b902a9e4443f5ad)
@@ -166,16 +166,16 @@
     local _has_error_=$FALSE
 
     servicePasswordLine=$(grep -A1 "\[Service\]" "$LOC_SETTINGS_CONF" | grep Password)      # store the service password line
-    _has_error_=$( [[ "$servicePasswordLine" ]] && $(true) || $(false) )
+    _has_error_= [[ -z "$servicePasswordLine" ]]
     exitError $_has_error_ $ERR_CLEAN_SETTINGS_CONF_PASSNOTFOUND "Password not found in '$LOC_SETTINGS_CONF'"
 
-    cp $LOC_SETTINGS_DFLT $LOC_SETTINGS_CONF                                                # reset the settings to default settings
+    sudo cp $LOC_SETTINGS_DFLT $LOC_SETTINGS_CONF                                           # reset the settings to default settings
     _has_error_=$?
-    exitError $_has_error_ $ERR_CLEAN_SETTINGS_CONF_OVERWRITE "Service settings overwrite filed"
+    exitError $_has_error_ $ERR_CLEAN_SETTINGS_CONF_OVERWRITE "Service settings overwrite failed"
 
-    sed -i "s/^.*Password.*$/$storedPassword/" $LOC_SETTINGS_CONF                           # keep  the             service password
+    sudo sed -i "s/^.*Password.*$/$servicePasswordLineK/" $LOC_SETTINGS_CONF                # keep  the             service password
     _has_error_=$?
-    exitError $_has_error_ $ERR_CLEAN_SETTINGS_DFLT_RESTORE "Service password restore filed"
+    exitError $_has_error_ $ERR_CLEAN_SETTINGS_DFLT_RESTORE "Service password restore failed"
 }
 
 function deleteLogFiles() {