Fix for conflicts in signup and login views