Added redirection to enrollment when exists