User admin

let's try to keep commented code out of master.