Fixed a couple of bugs
some additions in user-related dialogues