Improve adding user procedure