diff --git a/app/components/BookBuilder/BookBuilder.jsx b/app/components/BookBuilder/BookBuilder.jsx
index dfed3caa6c5df9a0694f696d3aa9a107a5f0581a..16a61fef21eaac48b0cbdaf25a9f9fe2d350ffd1 100644
--- a/app/components/BookBuilder/BookBuilder.jsx
+++ b/app/components/BookBuilder/BookBuilder.jsx
@@ -89,6 +89,7 @@ export class BookBuilder extends React.Component {
     })
 
     let roles = []
+    if (user.admin) roles.push('admin')
 
     function addRole (role) {
       roles = _.union(roles, [role])
diff --git a/app/components/BookBuilder/Chapter/EditingNotification.jsx b/app/components/BookBuilder/Chapter/EditingNotification.jsx
index 40986c81002afd65dda368d46b4be2cd314c5f50..16e771a38d5e1d79e86d9ba12c84a117c36d15fc 100644
--- a/app/components/BookBuilder/Chapter/EditingNotification.jsx
+++ b/app/components/BookBuilder/Chapter/EditingNotification.jsx
@@ -57,13 +57,14 @@ class EditingNotification extends React.Component {
     const { chapter, modalContainer, update } = this.props
     const { showModal } = this.state
     const username = chapter.lock.editor.username
+    const isAdmin = this.isAdmin()
 
     let message = username + ' is editing'
     let hoverTitle, unlockModal
     let toggle = noop
 
-    if (this.isAdmin()) {
-      toggle = this.toggle()
+    if (isAdmin) {
+      toggle = this.toggleModal
 
       unlockModal = (
         <UnlockModal
@@ -81,10 +82,15 @@ class EditingNotification extends React.Component {
       }
     }
 
+    const inlineStyle = {
+      'cursor': isAdmin ? 'pointer' : 'default'
+    }
+
     return (
       <a id='bb-unlock'
         className={styles.lEditing}
         onClick={toggle}
+        style={inlineStyle}
         title={hoverTitle}
       >
         <i