changes to devise scoping