diff --git a/cps/editbooks.py b/cps/editbooks.py
index 6d2f595c..2bbbbafa 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1246,11 +1246,10 @@ def handle_title_on_edit(book, book_title):
 
 
 def handle_author_on_edit(book, author_name, update_stored=True):
+    change = False
     # handle author(s)
     input_authors, renamed = prepare_authors(author_name)
 
-    change = modify_database_object(input_authors, book.authors, db.Authors, calibre_db.session, 'author')
-
     # Search for each author if author is in database, if not, author name and sorted author name is generated new
     # everything then is assembled for sorted author field in database
     sort_authors_list = list()
@@ -1265,6 +1264,9 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     if book.author_sort != sort_authors and update_stored:
         book.author_sort = sort_authors
         change = True
+
+    change |= modify_database_object(input_authors, book.authors, db.Authors, calibre_db.session, 'author')
+
     return input_authors, change, renamed
 
 
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 6552cd26..57fe701c 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -61,7 +61,7 @@
     </div>
     <div id="author_div" class="form-group">
       <label for="bookAuthor">{{_('Author')}}</label>
-      <input type="text" class="form-control typeahead" name="author_name" id="bookAuthor" value="{{' & '.join(authors)}}" autocomplete="off">
+      <input type="text" class="form-control typeahead" autocomplete="off" name="author_name" id="bookAuthor" value="{{' & '.join(authors)}}">
     </div>
 
     <div class="form-group">
@@ -85,11 +85,11 @@
 
     <div class="form-group">
       <label for="tags">{{_('Tags')}}</label>
-      <input type="text" class="form-control typeahead" name="tags" id="tags" value="{% for tag in book.tags %}{{tag.name.strip()}}{% if not loop.last %}, {% endif %}{% endfor %}">
+      <input type="text" class="form-control typeahead" autocomplete="off"  name="tags" id="tags" value="{% for tag in book.tags %}{{tag.name.strip()}}{% if not loop.last %}, {% endif %}{% endfor %}">
     </div>
     <div class="form-group">
       <label for="series">{{_('Series')}}</label>
-      <input type="text" class="form-control typeahead" name="series" id="series" value="{% if book.series %}{{book.series[0].name}}{% endif %}">
+      <input type="text" class="form-control typeahead" autocomplete="off" name="series" id="series" value="{% if book.series %}{{book.series[0].name}}{% endif %}">
     </div>
     <div class="form-group">
       <label for="series_index">{{_('Series ID')}}</label>
@@ -120,11 +120,11 @@
     </div>
     <div class="form-group">
       <label for="publisher">{{_('Publisher')}}</label>
-      <input type="text" class="form-control typeahead" name="publisher" id="publisher" value="{% if book.publishers|length > 0 %}{{book.publishers[0].name}}{% endif %}">
+      <input type="text" class="form-control typeahead" autocomplete="off" name="publisher" id="publisher" value="{% if book.publishers|length > 0 %}{{book.publishers[0].name}}{% endif %}">
     </div>
     <div class="form-group">
       <label for="languages">{{_('Language')}}</label>
-      <input type="text" class="form-control typeahead" name="languages" id="languages" value="{% for language in book.languages %}{{language.language_name.strip()}}{% if not loop.last %}, {% endif %}{% endfor %}">
+      <input type="text" class="form-control typeahead" autocomplete="off" name="languages" id="languages" value="{% for language in book.languages %}{{language.language_name.strip()}}{% if not loop.last %}, {% endif %}{% endfor %}">
     </div>
       {% if cc|length > 0 %}
         {% for c in cc %}