diff --git a/OpenCL/m19500_a1-pure.cl b/OpenCL/m19500_a1-pure.cl
index 64d3606dc..b8908ca62 100644
--- a/OpenCL/m19500_a1-pure.cl
+++ b/OpenCL/m19500_a1-pure.cl
@@ -93,10 +93,11 @@ __kernel void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t))
 
   sha1_init (&ctx0);
 
-  sha1_update (&ctx0, k, site_key_len);
-  sha1_update (&ctx0, glue, 2);
-  sha1_update (&ctx0, s, salt_len);
-  sha1_update (&ctx0, glue, 2);
+  sha1_update             (&ctx0, k, site_key_len);
+  sha1_update             (&ctx0, glue, 2);
+  sha1_update             (&ctx0, s, salt_len);
+  sha1_update             (&ctx0, glue, 2);
+  sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len);
 
   /**
    * loop
@@ -106,7 +107,6 @@ __kernel void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t))
   {
     sha1_ctx_t ctx = ctx0;
 
-    sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len);
     sha1_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
     sha1_update             (&ctx, glue, 2);
     sha1_update             (&ctx, k, site_key_len);
@@ -236,10 +236,11 @@ __kernel void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t))
 
   sha1_init (&ctx0);
 
-  sha1_update (&ctx0, k, site_key_len);
-  sha1_update (&ctx0, glue, 2);
-  sha1_update (&ctx0, s, salt_len);
-  sha1_update (&ctx0, glue, 2);
+  sha1_update             (&ctx0, k, site_key_len);
+  sha1_update             (&ctx0, glue, 2);
+  sha1_update             (&ctx0, s, salt_len);
+  sha1_update             (&ctx0, glue, 2);
+  sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len);
 
   /**
    * loop
@@ -249,7 +250,6 @@ __kernel void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t))
   {
     sha1_ctx_t ctx = ctx0;
 
-    sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len);
     sha1_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
     sha1_update             (&ctx, glue, 2);
     sha1_update             (&ctx, k, site_key_len);
diff --git a/src/modules/module_19500.c b/src/modules/module_19500.c
index 8cfb08287..b9b6e3e21 100644
--- a/src/modules/module_19500.c
+++ b/src/modules/module_19500.c
@@ -132,7 +132,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
   salt->salt_buf[0] = devise_double_salt->salt_buf[0];
   salt->salt_buf[1] = devise_double_salt->salt_buf[1];
 
-  salt->salt_len = devise_double_salt->salt_len;
+  salt->salt_len = 8;
 
   return (PARSER_OK);
 }