Two bugs with usernames starting with subfolder name

Fixed with that PR