move the aes key location so that the correct NEW key is sent

Fix #4562