diff --git a/ccserver/handlers.py b/ccserver/handlers.py
index f82470f08f04167ddd3728456c543f94f2a422d1..c7019d8558564cd4fbe8ae3ed9b05d15a93b8b54 100644
--- a/ccserver/handlers.py
+++ b/ccserver/handlers.py
@@ -751,11 +751,14 @@ class CliHandler(OnlineCCHandler):
                 errs.error(migration['sid'], errmsg)
                 continue
 
+            self._server.objects.update(ids=(migration['sid'],))
+            vm = self._server.objects.get_by_id(migration['sid'])
+
             # Construct the migration properties:
             migration_properties = {
                 'author': client.login,
-                'vm_name': migration['sid'].split('.')[-1],
-                'hv_source': '.'.join(migration['sid'].split('.')[:-1]),
+                'vm_name': vm['h'],
+                'hv_source': vm['p'],
                 'hv_dest': migration['did']
             }