1) Fixes for user login constraints