Beefed up the user object a bit and updated authentication to coincide with this change