Merge "Set user shell even if user is system"