Added if-user-with, fixed with-user.