Fix specs
Fix user logging in for master domain (plus specs)