Improve passed in args for user and pass