Better authorization form: close #15