UserDatabase fix