diff --git a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
index 587cedafe0..a5f40ad73d 100644
--- a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
+++ b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
@@ -135,7 +135,8 @@ public class CreateSpaceWizard extends BaseWizardBean
       {
          this.spaceType = this.getNodeService().getType(this.existingSpaceId).toString();
       }
-      else if (this.createFrom.equals(CREATEFROM_TEMPLATE) && this.templateSpaceId != null)
+      else if (this.createFrom.equals(CREATEFROM_TEMPLATE) && this.templateSpaceId != null &&
+               !this.templateSpaceId.equals("none"))
       {
          NodeRef templateNode = new NodeRef(Repository.getStoreRef(), this.templateSpaceId);
          this.spaceType = this.getNodeService().getType(templateNode).toString();
diff --git a/source/web/jsp/content/document-details.jsp b/source/web/jsp/content/document-details.jsp
index 33b25d1f91..3e6b172b7c 100644
--- a/source/web/jsp/content/document-details.jsp
+++ b/source/web/jsp/content/document-details.jsp
@@ -304,8 +304,11 @@
    <div style="padding: 4px"></div>
 </f:verbatim>
 
-<a:panel label="#{msg.version_history}" id="version-history-panel" progressive="true" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" rendered="#{DialogManager.bean.versionable}"
-   expanded='#{DialogManager.bean.panels["version-history-panel"]}' expandedActionListener="#{DialogManager.bean.expandPanel}">
+<a:panel label="#{msg.version_history}" id="version-history-panel" progressive="true" 
+         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" 
+         rendered="#{DialogManager.bean.versionable && !NavigationBean.isGuest}"
+         expanded='#{DialogManager.bean.panels["version-history-panel"]}' 
+         expandedActionListener="#{DialogManager.bean.expandPanel}">
 
    <a:richList id="versionHistoryList" viewMode="details" value="#{DialogManager.bean.versionHistory}" var="r" styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
       pageSize="10" initialSortColumn="versionDate" initialSortDescending="true">
@@ -361,8 +364,11 @@
       <a:dataPager styleClass="pager" id="pager-version-history" />
    </a:richList>
 </a:panel>
-<a:panel label="#{msg.version_history}" id="no-version-history-panel" progressive="true" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" rendered="#{DialogManager.bean.versionable == false}"
-   expanded='#{DialogManager.bean.panels["version-history-panel"]}' expandedActionListener="#{DialogManager.bean.expandPanel}">
+<a:panel label="#{msg.version_history}" id="no-version-history-panel" progressive="true" border="white" 
+         bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" 
+         rendered="#{DialogManager.bean.versionable == false && !NavigationBean.isGuest}"
+         expanded='#{DialogManager.bean.panels["version-history-panel"]}' 
+         expandedActionListener="#{DialogManager.bean.expandPanel}">
    <h:outputText id="no-history-msg" value="#{msg.not_versioned}<br/><br/>" escape="false" />
    <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write" id="eval_ver">
       <a:actionLink id="make-versionable" value="#{msg.allow_versioning}" action="#{DialogManager.bean.applyVersionable}" rendered="#{DialogManager.bean.locked == false}" />