Bugfixes for users & databases