Fix on_super_password in cli

Merged Michael R requested to merge fix-cli-password into master

Merge request reports