Address review comments.

identity-apps-core/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties

@@ -529,7 +529,6 @@ discovery.input.cannot.be.empty=Email cannot be empty.
 organization.name.cannot.be.empty=Organization name cannot be empty.
 provide.organization.name=Provide organization name
 provide.email.address=Provide email address
-self.registration.application.not.shared=The application is not shared with the organization associated with the provided email domain.
 
 # SCIM Attributes
 VXNlcm5hbWU_=Username

identity-apps-core/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_de_DE.properties

@@ -507,7 +507,6 @@ discovery.input.cannot.be.empty=E-Mail darf nicht leer sein.
 organization.name.cannot.be.empty=Der Name der Organisation darf nicht leer sein.
 provide.organization.name=Geben Sie den Namen der Organisation an
 provide.email.address=E-Mail-Adresse angeben
-self.registration.application.not.shared=Die Anwendung ist nicht mit der Organisation geteilt, die der angegebenen E-Mail-Domain zugeordnet ist.
 
 # SCIM Attributes
 VXNlcm5hbWU_=Nutzername

identity-apps-core/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_es_ES.properties

@@ -507,7 +507,6 @@ discovery.input.cannot.be.empty=El correo electrónico no puede estar vacío.
 organization.name.cannot.be.empty=El nombre de la organización no puede estar vacío.
 provide.organization.name=Proporcionar el nombre de la organización
 provide.email.address=Proporcionar dirección de correo electrónico
-self.registration.application.not.shared=La aplicación de registro propio no está compartida con la organización.
 
 # SCIM Attributes
 VXNlcm5hbWU_=Nombre de usuario

identity-apps-core/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties

@@ -508,7 +508,6 @@ discovery.input.cannot.be.empty=L'e-mail ne peut pas être vide.
 organization.name.cannot.be.empty=Le nom de l'organisation ne peut pas être vide.
 provide.organization.name=Fournir le nom de l'organisation
 provide.email.address=Fournir une adresse e-mail
-self.registration.application.not.shared= L'application n'est pas partagée avec l'organisation associée au domaine de messagerie fourni.
 
 # SCIM Attributes
 VXNlcm5hbWU_=Nom d'utilisateur

identity-apps-core/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_ja_JP.properties

@@ -506,7 +506,6 @@ discovery.input.cannot.be.empty=電子メールを空にすることはできま
 organization.name.cannot.be.empty=組織名を空にすることはできません。
 provide.organization.name=組織名を入力してください
 provide.email.address=メールアドレスを入力してください
-self.registration.application.not.shared=アプリケーションは、指定されたメールドメインに関連する組織と共有されていません。
 
 ## SCIM Attributes
 VXNlcm5hbWU_=ユーザー名

identity-apps-core/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_pt_BR.properties

@@ -503,7 +503,6 @@ discovery.input.cannot.be.empty=O e-mail não pode ficar vazio.
 organization.name.cannot.be.empty=O nome da organização não pode ficar vazio.
 provide.organization.name=Forneça o nome da organização
 provide.email.address=Forneça endereço de e-mail
-self.registration.application.not.shared=O aplicativo não está compartilhado com a organização associada ao domínio de e-mail fornecido.
 
 # SCIM Attributes
 VXNlcm5hbWU_=Nome de Usuário

identity-apps-core/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_pt_PT.properties

@@ -507,7 +507,6 @@ discovery.input.cannot.be.empty=O e-mail não pode ficar vazio.
 organization.name.cannot.be.empty=O nome da organização não pode ficar vazio.
 provide.organization.name=Forneça o nome da organização
 provide.email.address=Forneça endereço de e-mail
-self.registration.application.not.shared=O aplicativo não está compartilhado com a organização associada ao domínio de e-mail fornecido.
 
 # SCIM Attributes
 VXNlcm5hbWU_=Nome de usuário

identity-apps-core/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_zh_CN.properties

@@ -506,7 +506,6 @@ discovery.input.cannot.be.empty=电子邮件不能为空。
 organization.name.cannot.be.empty=组织名称不能为空。
 provide.organization.name=提供组织名称
 provide.email.address=提供电子邮件地址
-self.registration.application.not.shared=此应用程序未与关联提供的电子邮件域的组织共享。
 
 ## SCIM Attributes
 VXNlcm5hbWU_=用户名

identity-apps-core/apps/authentication-portal/src/main/webapp/org_discovery.jsp

@@ -44,14 +44,13 @@
            errorMessage = request.getParameter(Constants.AUTH_FAILURE_MSG);
            if (errorMessage.equalsIgnoreCase("authentication.fail.message")) {
                errorMessage = AuthenticationEndpointUtil.i18n(resourceBundle, "error.retry");
-            } else if (isSelfRegistration && errorMessage.equalsIgnoreCase("Can't identify organization")) {
+            } else if (isSelfRegistration && (errorMessage.equalsIgnoreCase("Can't identify organization") 
+               || errorMessage.equalsIgnoreCase("Organization is not associated with this application."))) {
                errorMessage = AuthenticationEndpointUtil.i18n(resourceBundle, "invalid.organization.discovery.input.self.registration");
             } else if (errorMessage.equalsIgnoreCase("Can't identify organization")) {
                errorMessage = AuthenticationEndpointUtil.i18n(resourceBundle, "invalid.organization.discovery.input");
             } else if (errorMessage.equalsIgnoreCase("invalid.organization.discovery.type")) {
                errorMessage = AuthenticationEndpointUtil.i18n(resourceBundle, "invalid.organization.discovery.type");
-            } else if (isSelfRegistration && errorMessage.equalsIgnoreCase("Organization is not associated with this application.")) {
-               errorMessage = AuthenticationEndpointUtil.i18n(resourceBundle, "self.registration.application.not.shared");
             } else if (isErrorFallbackLocale) {
                 errorMessage = AuthenticationEndpointUtil.i18n(resourceBundle,"error.retry");
             }

identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-username-request.jsp

@@ -237,6 +237,7 @@
                             } else {
                                 isSSOLoginAuthenticatorConfigured = true;
                             }
+                            break;
                         }
                     }