Some Fixes on user Management...