Merge "Allow current user in settings command"