sug-131 fixed disabling if authorization request fails
sug-131 fixed disabling if authorization request fails
sug-131 fixed disabling if authorization request fails (merge)