Refactored user credentials