diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/portlet/KaleoFormsAdminPortlet.java b/modules/dxp/apps/portal-workflow/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/portlet/KaleoFormsAdminPortlet.java
index 601b95fdf8e855e29f3b8fa53166508b8b5a6374..9c1913ead35e5430614fbc6c89ceff3c2de19f47 100644
--- a/modules/dxp/apps/portal-workflow/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/portlet/KaleoFormsAdminPortlet.java
+++ b/modules/dxp/apps/portal-workflow/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/portlet/KaleoFormsAdminPortlet.java
@@ -63,6 +63,8 @@ import com.liferay.portal.kernel.transaction.TransactionConfig;
 import com.liferay.portal.kernel.transaction.TransactionInvokerUtil;
 import com.liferay.portal.kernel.upload.UploadPortletRequest;
 import com.liferay.portal.kernel.util.ContentTypes;
+import com.liferay.portal.kernel.util.ListUtil;
+import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.LocalizationUtil;
 import com.liferay.portal.kernel.util.MimeTypesUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
@@ -106,7 +108,6 @@ import com.liferay.portal.workflow.kaleo.service.KaleoDefinitionVersionLocalServ
 import java.io.IOException;
 
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -166,6 +167,21 @@ import org.osgi.service.component.annotations.Reference;
 )
 public class KaleoFormsAdminPortlet extends MVCPortlet {
 
+	public KaleoFormsAdminPortlet() {
+		_parameterNames = ListUtil.fromArray(
+			"backURL", "ddmStructureId", "ddmStructureName", "ddmTemplateId",
+			"historyKey", "kaleoProcessId", "kaleoTaskFormPairsData", "mvcPath",
+			"redirect", "translatedLanguagesDescription",
+			"translatedLanguagesName", "workflowDefinition");
+
+		for (Locale availableLocale : LanguageUtil.getAvailableLocales()) {
+			_parameterNames.add(
+				"description" + LocaleUtil.toLanguageId(availableLocale));
+			_parameterNames.add(
+				"name" + LocaleUtil.toLanguageId(availableLocale));
+		}
+	}
+
 	/**
 	 * Deactivates the <code>WorkflowDefinition</code> (in
 	 * <code>com.liferay.portal.kernel</code>) by using its name and version
@@ -856,26 +872,22 @@ public class KaleoFormsAdminPortlet extends MVCPortlet {
 	 *
 	 * @param  resourceRequest the resource request
 	 * @param  resourceResponse the resource response
-	 * @throws Exception if an exception occurred
 	 */
 	protected void saveInPortletSession(
-			ResourceRequest resourceRequest, ResourceResponse resourceResponse)
-		throws Exception {
+		ResourceRequest resourceRequest, ResourceResponse resourceResponse) {
 
-		Enumeration<String> enumeration = resourceRequest.getParameterNames();
+		Map<String, String[]> parameterMap = resourceRequest.getParameterMap();
 
-		while (enumeration.hasMoreElements()) {
-			String name = enumeration.nextElement();
+		PortletSession portletSession = resourceRequest.getPortletSession();
 
-			if (name.equals("doAsUserId")) {
+		for (String parameterName : _parameterNames) {
+			if (!parameterMap.containsKey(parameterName)) {
 				continue;
 			}
 
-			PortletSession portletSession = resourceRequest.getPortletSession();
-
-			String value = ParamUtil.getString(resourceRequest, name);
-
-			portletSession.setAttribute(name, value);
+			portletSession.setAttribute(
+				parameterName,
+				ParamUtil.getString(resourceRequest, parameterName));
 		}
 	}
 
@@ -1233,6 +1245,7 @@ public class KaleoFormsAdminPortlet extends MVCPortlet {
 		_kaleoDefinitionVersionLocalService;
 	private volatile KaleoFormsWebConfiguration _kaleoFormsWebConfiguration;
 	private KaleoProcessService _kaleoProcessService;
+	private final List<String> _parameterNames;
 
 	@Reference
 	private Portal _portal;