Cleaning up the auth stuff

just some basic cleaning up, nothing really changed :\
Cleaned up CleanModel() :D

Set some defaults, replaced some code with a regex. untested, but should
work.