#368 + #502 +  #501

Add protected user only if needed
Add single user remove
Different working dirs