Bugfix: Adding a user could result in blank page