User activation

definitely a clean pull request
work in progress