diff --git a/app/components/DocumentMeta.js b/app/components/DocumentMeta.js
index b5af26a5..b1b79964 100644
--- a/app/components/DocumentMeta.js
+++ b/app/components/DocumentMeta.js
@@ -8,6 +8,7 @@ import Document from "models/Document";
 import DocumentBreadcrumb from "components/DocumentBreadcrumb";
 import Flex from "components/Flex";
 import Time from "components/Time";
+import useCurrentUser from "hooks/useCurrentUser";
 import useStores from "hooks/useStores";
 
 const Container = styled(Flex)`
@@ -50,7 +51,9 @@ function DocumentMeta({
   ...rest
 }: Props) {
   const { t } = useTranslation();
-  const { collections, auth } = useStores();
+  const { collections } = useStores();
+  const user = useCurrentUser();
+
   const {
     modifiedSinceViewed,
     updatedAt,
@@ -69,6 +72,8 @@ function DocumentMeta({
     return null;
   }
 
+  const collection = collections.get(document.collectionId);
+  const lastUpdatedByCurrentUser = user.id === updatedBy.id;
   let content;
 
   if (deletedAt) {
@@ -103,15 +108,12 @@ function DocumentMeta({
     );
   } else {
     content = (
-      <Modified highlight={modifiedSinceViewed}>
+      <Modified highlight={modifiedSinceViewed && !lastUpdatedByCurrentUser}>
         {t("updated")} <Time dateTime={updatedAt} addSuffix />
       </Modified>
     );
   }
 
-  const collection = collections.get(document.collectionId);
-  const updatedByMe = auth.user && auth.user.id === updatedBy.id;
-
   const timeSinceNow = () => {
     if (isDraft || !showLastViewed) {
       return null;
@@ -137,7 +139,7 @@ function DocumentMeta({
 
   return (
     <Container align="center" rtl={document.dir === "rtl"} {...rest} dir="ltr">
-      {updatedByMe ? t("You") : updatedBy.name}&nbsp;
+      {lastUpdatedByCurrentUser ? t("You") : updatedBy.name}&nbsp;
       {to ? <Link to={to}>{content}</Link> : content}
       {showCollection && collection && (
         <span>
diff --git a/app/menus/TemplatesMenu.js b/app/menus/TemplatesMenu.js
index c1f7d647..163fcefe 100644
--- a/app/menus/TemplatesMenu.js
+++ b/app/menus/TemplatesMenu.js
@@ -40,13 +40,13 @@ function TemplatesMenu({ document }: Props) {
       {...menu}
     >
       <DocumentIcon />
-      <div>
+      <TemplateItem>
         <strong>{template.titleWithDefault}</strong>
         <br />
         <Author>
           {t("By {{ author }}", { author: template.createdBy.name })}
         </Author>
-      </div>
+      </TemplateItem>
     </MenuItem>
   );
 
@@ -70,9 +70,12 @@ function TemplatesMenu({ document }: Props) {
   );
 }
 
-const Author = styled.div`
-  font-size: 13px;
+const TemplateItem = styled.div`
   text-align: left;
 `;
 
+const Author = styled.div`
+  font-size: 13px;
+`;
+
 export default observer(TemplatesMenu);
diff --git a/app/scenes/Document/components/Document.js b/app/scenes/Document/components/Document.js
index 7b326509..0c6499e7 100644
--- a/app/scenes/Document/components/Document.js
+++ b/app/scenes/Document/components/Document.js
@@ -76,6 +76,10 @@ class DocumentScene extends React.Component<Props> {
   @observable title: string = this.props.document.title;
   getEditorText: () => string = () => this.props.document.text;
 
+  componentDidMount() {
+    this.updateIsDirty();
+  }
+
   componentDidUpdate(prevProps) {
     const { auth, document, t } = this.props;
 
@@ -113,6 +117,7 @@ class DocumentScene extends React.Component<Props> {
       document.injectTemplate = false;
       this.title = document.title;
       this.isDirty = true;
+      this.updateIsDirty();
     }
   }
 
@@ -529,6 +534,6 @@ const MaxWidth = styled(Flex)`
 
 export default withRouter(
   withTranslation()<DocumentScene>(
-    inject("ui", "auth", "policies", "revisions", "toasts")(DocumentScene)
+    inject("ui", "auth", "toasts")(DocumentScene)
   )
 );
diff --git a/app/scenes/Document/components/Editor.js b/app/scenes/Document/components/Editor.js
index 766e37e2..df442c7e 100644
--- a/app/scenes/Document/components/Editor.js
+++ b/app/scenes/Document/components/Editor.js
@@ -1,6 +1,6 @@
 // @flow
 import { observable } from "mobx";
-import { observer } from "mobx-react";
+import { inject, observer } from "mobx-react";
 import * as React from "react";
 import Textarea from "react-autosize-textarea";
 import { type TFunction, withTranslation } from "react-i18next";
@@ -9,6 +9,7 @@ import breakpoint from "styled-components-breakpoint";
 import { MAX_TITLE_LENGTH } from "shared/constants";
 import { light } from "shared/theme";
 import parseTitle from "shared/utils/parseTitle";
+import PoliciesStore from "stores/PoliciesStore";
 import Document from "models/Document";
 import ClickablePadding from "components/ClickablePadding";
 import DocumentMetaWithViews from "components/DocumentMetaWithViews";
@@ -29,6 +30,7 @@ type Props = {|
   onSave: ({ done?: boolean, autosave?: boolean, publish?: boolean }) => any,
   innerRef: { current: any },
   children: React.Node,
+  policies: PoliciesStore,
   t: TFunction,
 |};
 
@@ -104,10 +106,12 @@ class DocumentEditor extends React.Component<Props> {
       readOnly,
       innerRef,
       children,
+      policies,
       t,
       ...rest
     } = this.props;
 
+    const can = policies.abilities(document.id);
     const { emoji } = parseTitle(title);
     const startsWithEmojiAndSpace = !!(emoji && title.startsWith(`${emoji} `));
     const normalizedTitle =
@@ -124,7 +128,9 @@ class DocumentEditor extends React.Component<Props> {
             dir="auto"
           >
             <span>{normalizedTitle}</span>{" "}
-            {!shareId && <StarButton document={document} size={32} />}
+            {(can.star || can.unstar) && (
+              <StarButton document={document} size={32} />
+            )}
           </Title>
         ) : (
           <Title
@@ -231,4 +237,6 @@ const Title = styled(Textarea)`
   }
 `;
 
-export default withTranslation()<DocumentEditor>(DocumentEditor);
+export default withTranslation()<DocumentEditor>(
+  inject("policies")(DocumentEditor)
+);
diff --git a/app/scenes/Document/components/Header.js b/app/scenes/Document/components/Header.js
index 7a4b5108..259f455d 100644
--- a/app/scenes/Document/components/Header.js
+++ b/app/scenes/Document/components/Header.js
@@ -76,7 +76,7 @@ function DocumentHeader({
     onSave({ done: true, publish: true });
   }, [onSave]);
 
-  const isNew = document.isNew;
+  const isNew = document.isNewDocument;
   const isTemplate = document.isTemplate;
   const can = policies.abilities(document.id);
   const canShareDocument = auth.team && auth.team.sharing && can.share;
diff --git a/server/policies/document.js b/server/policies/document.js
index e616111f..519fdbb3 100644
--- a/server/policies/document.js
+++ b/server/policies/document.js
@@ -23,7 +23,6 @@ allow(User, ["star", "unstar"], Document, (user, document) => {
   if (document.archivedAt) return false;
   if (document.deletedAt) return false;
   if (document.template) return false;
-  if (!document.publishedAt) return false;
 
   invariant(
     document.collection,