Merge "Fix app crash while adding new user"