registration-authorization
some important fixes