diff --git a/portal-web/docroot/html/portlet/wiki/edit_page.jsp b/portal-web/docroot/html/portlet/wiki/edit_page.jsp
index 34de0ee1c8e3377fa55629751eb3a14caa9e1484..892e51f1e20671cfd383c44db1352e4524d4ab12 100644
--- a/portal-web/docroot/html/portlet/wiki/edit_page.jsp
+++ b/portal-web/docroot/html/portlet/wiki/edit_page.jsp
@@ -19,15 +19,6 @@
 <%
 String redirect = ParamUtil.getString(request, "redirect");
 
-String originalRedirect = ParamUtil.getString(request, "originalRedirect", StringPool.BLANK);
-
-if (originalRedirect.equals(StringPool.BLANK)) {
-	originalRedirect = redirect;
-}
-else {
-	redirect = originalRedirect;
-}
-
 boolean followRedirect = false;
 
 WikiNode node = (WikiNode)request.getAttribute(WebKeys.WIKI_NODE);
@@ -177,7 +168,6 @@ if (Validator.isNull(redirect)) {
 <aui:form action="<%= editPageActionURL %>" method="post" name="fm" onSubmit='<%= "event.preventDefault(); " + renderResponse.getNamespace() + "savePage();" %>'>
 	<aui:input name="<%= Constants.CMD %>" type="hidden" />
 	<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
-	<aui:input name="originalRedirect" type="hidden" value="<%= originalRedirect %>" />
 	<aui:input name="nodeId" type="hidden" value="<%= nodeId %>" />
 	<aui:input name="newPage" type="hidden" value="<%= newPage %>" />
 
@@ -247,9 +237,7 @@ if (Validator.isNull(redirect)) {
 				</c:if>
 
 				<c:if test="<%= Validator.isNotNull(parentTitle) %>">
-					<aui:field-wrapper label="parent">
-						<liferay-ui:input-resource url="<%= parentTitle %>" />
-					</aui:field-wrapper>
+					<aui:input name="parent" type="resource" value="<%= parentTitle %>" />
 				</c:if>
 
 				<c:choose>
@@ -326,9 +314,13 @@ if (Validator.isNull(redirect)) {
 							<%
 							for (int i = 0; i < attachmentsFileEntries.size(); i++) {
 								FileEntry attachmentsFileEntry = attachmentsFileEntries.get(i);
+
+								String portletFileEntryURL = PortletFileRepositoryUtil.getPortletFileEntryURL(themeDisplay, attachmentsFileEntry, StringPool.BLANK);
+
+								String downloadPortletFileEntryURL = HttpUtil.addParameter(portletFileEntryURL, "download", true);
 							%>
 
-								<aui:a href="<%= (templatePage != null) && (templatePage.getAttachmentsFileEntriesCount() > 0) ? PortletFileRepositoryUtil.getPortletFileEntryURL(themeDisplay, attachmentsFileEntry, StringPool.BLANK) : null %>"><%= attachmentsFileEntry.getTitle() %></aui:a> (<%= TextFormatter.formatStorageSize(attachmentsFileEntry.getSize(), locale) %>)<%= (i < (attachmentsFileEntries.size() - 1)) ? ", " : "" %>
+								<aui:a href="<%= (templatePage != null) && (templatePage.getAttachmentsFileEntriesCount() > 0) ? downloadPortletFileEntryURL : null %>"><%= attachmentsFileEntry.getTitle() %></aui:a> (<%= TextFormatter.formatStorageSize(attachmentsFileEntry.getSize(), locale) %>)<%= (i < (attachmentsFileEntries.size() - 1)) ? ", " : "" %>
 
 							<%
 							}
@@ -361,12 +353,12 @@ if (Validator.isNull(redirect)) {
 				}
 				%>
 
+				<aui:input label="description-of-the-changes" name="summary" />
+
 				<c:if test="<%= newPage || wikiPage.isApproved() %>">
 					<aui:model-context bean="<%= new WikiPageImpl() %>" model="<%= WikiPage.class %>" />
 				</c:if>
 
-				<aui:input label="description-of-the-changes" name="summary" />
-
 				<c:if test="<%= !newPage %>">
 					<aui:input label="this-is-a-minor-edit" name="minorEdit" />
 				</c:if>
@@ -464,7 +456,7 @@ if (Validator.isNull(redirect)) {
 					Format dateFormatDate = FastDateFormatFactoryUtil.getDateTime(locale, timeZone);
 					%>
 
-					<%= LanguageUtil.format(pageContext, "this-page-cannot-be-edited-because-user-x-is-modifying-it-and-the-results-have-not-been-published-yet", new Object[] {wikiPage.getUserName(), dateFormatDate.format(wikiPage.getModifiedDate())}) %>
+					<%= LanguageUtil.format(pageContext, "this-page-cannot-be-edited-because-user-x-is-modifying-it-and-the-results-have-not-been-published-yet", new Object[] {HtmlUtil.escape(wikiPage.getUserName()), dateFormatDate.format(wikiPage.getModifiedDate())}, false) %>
 				</div>
 			</c:if>
 		</c:otherwise>
@@ -491,7 +483,7 @@ if (Validator.isNull(redirect)) {
 			document.<portlet:namespace />fm.<portlet:namespace />content.value = window.<portlet:namespace />editor.getHTML();
 		}
 
-		submitForm(document.<portlet:namespace />fm);
+		submitForm(document.<portlet:namespace />fm, null, null, false);
 	}
 
 	function <portlet:namespace />discardDraftPage() {
