[Jorge/Cassie] Fix user credential validation