Now saves username