Fix so password prompt is shown when necessary

SecureString is always initialized, so should never be null, so also
need to check for length to determine whether to show password prompt