Fixed conds for add user; test cases in progress