diff --git a/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java b/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
index 9186890fb..130ee7132 100644
--- a/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
+++ b/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
@@ -441,9 +441,12 @@ private void getXHTMLAuthenticationFormViaLoginResource(HttpServletRequest reque
                     log.error(e, e);
                 }
 
-                // INFO: Get view of resource
-                String viewId = null;
-                org.wyona.yanel.core.attributes.viewable.View view = ((org.wyona.yanel.core.api.attributes.ViewableV2) res).getView(viewId);
+        // INFO: Get view of resource
+        String viewId = null;
+        if (request.getParameter("yanel.resource.viewid") != null) {
+            viewId = request.getParameter("yanel.resource.viewid");
+        }
+        org.wyona.yanel.core.attributes.viewable.View view = ((org.wyona.yanel.core.api.attributes.ViewableV2) res).getView(viewId);
 
                 // INFO: Set mime type
                 String mimeType = view.getMimeType();