updating to new user support
Merge branch 'mrhines'