Add user checking
Merge branch 'staging'