diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po
index 1121056e..c6b76bf6 100644
--- a/out/locale/en/LC_MESSAGES/default.po
+++ b/out/locale/en/LC_MESSAGES/default.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2017-02-23 18:14+0100\n"
+"PO-Revision-Date: 2017-02-28 20:21+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
 "language/en/)\n"
@@ -520,6 +520,10 @@ msgstr "WHERE clause for data copying:"
 msgid "Recent filters"
 msgstr "Recent filters"
 
+#. Copy table dialog
+msgid "Please select the required index for the %s flag."
+msgstr "Please select the required index for the %s flag."
+
 #. CreateDatabaseForm..Caption
 #: createdatabase.dfm:5 createdatabase.pas:92
 msgid "Create database ..."
diff --git a/source/copytable.pas b/source/copytable.pas
index e0268683..bf9dfe3e 100644
--- a/source/copytable.pas
+++ b/source/copytable.pas
@@ -358,7 +358,7 @@ end;
 
 procedure TCopyTableForm.btnOKClick(Sender: TObject);
 var
-  CreateCode, InsertCode, TargetTable, DataCols: String;
+  CreateCode, InsertCode, TargetTable, DataCols, Msg: String;
   TableExistence: String;
   ParentNode, Node: PVirtualNode;
   DoData, AutoIncGetsKey, AutoIncRemoved, TableHasAutoInc: Boolean;
@@ -425,7 +425,8 @@ begin
     AutoIncRemoved := False;
     if Column.DefaultType = cdtAutoInc then begin
       for Key in SelectedKeys do begin
-        if ((Key.IndexType = PKEY) or (Key.IndexType = UKEY)) and (Key.Columns.IndexOf(Column.Name) > -1) then begin
+        // Don't check index type, MySQL allows auto-increment columns on nearly all indexes
+        if Key.Columns.IndexOf(Column.Name) > -1 then begin
           AutoIncGetsKey := True;
           Break;
         end;
@@ -494,7 +495,10 @@ begin
   except
     on E:EDatabaseError do begin
       Screen.Cursor := crDefault;
-      ErrorDialog(E.Message);
+      Msg := E.Message;
+      if FConnection.LastErrorCode = 1075 then
+        Msg := Msg + CRLF + CRLF +  f_('Please select the required index for the %s flag.', ['auto_increment']);
+      ErrorDialog(Msg);
       ModalResult := mrNone;
     end;
   end;