Implemented more secure save user approach