Fix behaviour for custom user model, remove debug output