diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index bfe60e7120b640d5fbf47f7323ec90b577a20e3f..e6f2e330d53e1148c0b448c05ee881b78a5702ed 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -152,7 +152,7 @@ function passwords_show_apps {
         if [[ $(function_exists change_password_${a}) == "1" ]]; then
             i=$((i+1))
             W+=($i "$a")
-            name+=("$u")
+            name+=("$a")
         fi
     done
 
@@ -180,7 +180,7 @@ function view_or_change_passwords {
     trap "rm -f $data" 0 1 2 5 15
     dialog --title $"View or Change Password" \
            --backtitle $"Freedombone Control Panel" \
-           --inputbox $"${SELECTED_APP} password for ${SELECTED_USER}. Copy or change it if you wish." 8 60 "$CURR_PASSWORD" 2>$data
+           --inputbox $"${SELECTED_APP} password for ${SELECTED_USERNAME}. Copy or change it if you wish." 8 60 "$CURR_PASSWORD" 2>$data
     sel=$?
     case $sel in
         0)