Minor cleanup of AuthForm. Still not properly implemented