diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index e6f2e330..49ed54be 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -186,7 +186,7 @@ function view_or_change_passwords {
         0)
             CURR_PASSWORD=$(<$data)
             if [ ${#CURR_PASSWORD} -gt 8 ]; then
-                ${PROJECT_NAME}-pass -u ${SELECTED_USERNAME} -a ${SELECTED_APP} -p ${CURR_PASSWORD}
+                ${PROJECT_NAME}-pass -u ${SELECTED_USERNAME} -a ${SELECTED_APP} -p "${CURR_PASSWORD}"
                 change_password_${SELECTED_APP} ${SELECTED_USERNAME} "${CURR_PASSWORD}"
                 dialog --title $"Change password" \
                        --msgbox $"The password was changed" 6 40