added superuser and uncommented username check