Externalize key
fix new user bug