Generate temporay password
Fix merge conflict