Fixed the issue with username being passed to help