Ensure admin and daemon usernames are preserved