diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index a7aab073..57be814c 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -268,7 +268,7 @@ function view_or_change_passwords {
 
     CURR_PASSWORD=$(${PROJECT_NAME}-pass -u ${SELECTED_USERNAME} -a ${SELECTED_APP})
 
-    icann_address=$(get_app_icann_address "$app_name")
+    icann_address=$(get_app_icann_address "${SELECTED_APP}")
     onion_address=$(get_app_onion_address "${SELECTED_APP}")
 
     titlestr=$"View or Change Password"