diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index 89a69f3f2d..d1235e5b57 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -638,7 +638,6 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
 
         default:
             att.resp_msg = "Internal error. Action result not defined";
-
             failure_response(INTERNAL, att);
     }
 
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 04051b788d..4d73b3cec3 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -4797,7 +4797,7 @@ int VirtualMachine::generate_token_context(VectorAttribute * context, string& e)
     context->replace("VMID", oid);
 
     // Store the original owner to compute token_password in case of a chown
-    add_template_attribute("CREATED_BY", uid);
+    replace_template_attribute("CREATED_BY", uid);
 
     return 0;
 }