Added user authentication
merding conflicts