fix for password generation and storage service name issues