diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml
index a5b36a12e..087bdda93 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml
@@ -114,7 +114,8 @@
     </delete>
 
     <!-- Insert single connection -->
-    <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel">
+    <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
+            parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel">
 
         INSERT INTO guacamole_connection (
             connection_name,
@@ -127,10 +128,6 @@
             #{object.protocol,jdbcType=VARCHAR}
         )
 
-        <selectKey resultType="java.lang.String" keyProperty="objectID" order="AFTER">
-            SELECT LAST_INSERT_ID()
-        </selectKey>
-
     </insert>
 
     <!-- Update single connection -->
diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml
index 118b098eb..4b732845d 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml
@@ -107,7 +107,8 @@
     </delete>
 
     <!-- Insert single user -->
-    <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserModel">
+    <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
+            parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserModel">
 
         INSERT INTO guacamole_user (
             username,
@@ -120,10 +121,6 @@
             #{object.passwordSalt,jdbcType=BINARY}
         )
 
-        <selectKey resultType="java.lang.Integer" keyProperty="objectID" order="AFTER">
-            SELECT LAST_INSERT_ID()
-        </selectKey>
-
     </insert>
 
     <!-- Update single user -->