Remove Reliance on userObject for Authentication System