diff --git a/src/components/FileList/AddFilePermissions.jsx b/src/components/FileList/AddFilePermissions.jsx
index 904e7adc6..0a44b3433 100644
--- a/src/components/FileList/AddFilePermissions.jsx
+++ b/src/components/FileList/AddFilePermissions.jsx
@@ -15,7 +15,7 @@ const AddFilePermission = ({ onCancel, onSubmit, onChange, selectedUsers, projec
     const projectMembersByHandle = mapKeys(projectMembers, value => value.handle)
     return handles.filter(handle => handle).map(h => get(projectMembersByHandle[h], 'userId'))
   }
-  
+
   return (
     <Modal
       isOpen
@@ -43,15 +43,20 @@ const AddFilePermission = ({ onCancel, onSubmit, onChange, selectedUsers, projec
             >All project members</button>
           </div>
         </div>
-        
+
         {/* Share with specific people */}
         <div className="input-container">
           <div className="hint">OR ONLY SPECIFIC PEOPLE</div>
 
-          <UserAutoComplete projectMembers={projectMembers} selectedUsers={selectedUsers} onUpdate={onChange} loggedInUser={loggedInUser} />
+          <UserAutoComplete
+            projectMembers={projectMembers}
+            selectedUsers={selectedUsers ? selectedUsers.split(',').map((handle) => ({ value: handle, label: handle })) : []}
+            onUpdate={onChange}
+            loggedInUser={loggedInUser}
+          />
 
           <div styleName="btn-selected-members">
-            <button className="tc-btn tc-btn-primary tc-btn-md" 
+            <button className="tc-btn tc-btn-primary tc-btn-md"
               onClick={() => onSubmit(mapHandlesToUserIds(selectedUsers.split(',')))}
               disabled={!selectedUsers || selectedUsers.length === 0 || isSharingAttachment }
             >Share with selected members</button>
@@ -63,11 +68,11 @@ const AddFilePermission = ({ onCancel, onSubmit, onChange, selectedUsers, projec
 }
 
 AddFilePermission.propTypes = {
-  onCancel: PropTypes.func.isRequired, 
-  onSubmit: PropTypes.func.isRequired, 
-  onChange: PropTypes.func.isRequired, 
-  selectedUsers: PropTypes.string, 
-  projectMembers: PropTypes.object, 
+  onCancel: PropTypes.func.isRequired,
+  onSubmit: PropTypes.func.isRequired,
+  onChange: PropTypes.func.isRequired,
+  selectedUsers: PropTypes.string,
+  projectMembers: PropTypes.object,
   loggedInUser: PropTypes.object.isRequired,
   isSharingAttachment: PropTypes.bool.isRequired,
 }
diff --git a/src/components/FileList/FileListItem.jsx b/src/components/FileList/FileListItem.jsx
index 5c2fb962d..1d1ea0cb1 100644
--- a/src/components/FileList/FileListItem.jsx
+++ b/src/components/FileList/FileListItem.jsx
@@ -113,10 +113,11 @@ export default class FileListItem extends React.Component {
         { (errors && errors.title) && <div className="error-message">{ errors.title }</div> }
         <textarea defaultValue={description} ref="desc" maxLength={250} className="tc-textarea" />
         { (errors && errors.desc) && <div className="error-message">{ errors.desc }</div> }
-        <UserAutoComplete onUpdate={this.onUserIdChange}
+        <UserAutoComplete
+          onUpdate={this.onUserIdChange}
           projectMembers={projectMembers}
           loggedInUser={loggedInUser}
-          selectedUsers={this.userIdsToHandles(allowedUsers).join(',')}
+          selectedUsers={this.userIdsToHandles(allowedUsers).map((handle) => ({ value: handle, label: handle }))}
         />
       </div>
     )
diff --git a/src/components/LinksMenu/EditFileAttachment.jsx b/src/components/LinksMenu/EditFileAttachment.jsx
index 525f2c951..95c32cae9 100644
--- a/src/components/LinksMenu/EditFileAttachment.jsx
+++ b/src/components/LinksMenu/EditFileAttachment.jsx
@@ -49,10 +49,10 @@ export class EditFileAttachment extends React.Component {
         You're about to edit an attachment
         </div>
         <div className="modal-body">
-          <label for="title">Title:</label>
+          <label htmlFor="title">Title:</label>
           <input className="edit-input" type="text" value={title} onChange={this.handleTitleChange.bind(this)} name="title"/>
           <br />
-          <label for="title">File Viewers:</label>
+          <label>File Viewers:</label>
           <UserAutoComplete onUpdate={this.onUserIdChange}
             projectMembers={projectMembers}
             loggedInUser={loggedInUser}
diff --git a/src/components/UserAutoComplete/UserAutoComplete.jsx b/src/components/UserAutoComplete/UserAutoComplete.jsx
index 1c6c61834..7943e4dd5 100644
--- a/src/components/UserAutoComplete/UserAutoComplete.jsx
+++ b/src/components/UserAutoComplete/UserAutoComplete.jsx
@@ -37,7 +37,10 @@ const UserAutoComplete = ({
 
 UserAutoComplete.propTypes = {
   projectMembers: PropTypes.object,
-  selectedUsers: PropTypes.string,
+  selectedUsers: PropTypes.arrayOf(PropTypes.shape({
+    value: PropTypes.string,
+    label: PropTypes.string,
+  })),
   onUpdate: PropTypes.func,
   loggedInUser: PropTypes.object
 }
diff --git a/src/projects/create/components/FillProjectDetails.js b/src/projects/create/components/FillProjectDetails.js
index 6a8393837..e76e9d1d5 100644
--- a/src/projects/create/components/FillProjectDetails.js
+++ b/src/projects/create/components/FillProjectDetails.js
@@ -71,7 +71,7 @@ class FillProjectDetails extends Component  {
                     submitBtnText={ submitBtnText }
                     productTemplates={productTemplates}
                   />
-                  <ProjectEstimationSection project={dirtyProject} templates={templates} />
+                  {/* <ProjectEstimationSection project={dirtyProject} templates={templates} /> */}
                 </div>
                 {formDisclaimer && (
                   <div className="left-area-footer">