diff --git a/airgun/entities/virtwho_configure.py b/airgun/entities/virtwho_configure.py
index 187ec801d..d1bbaef67 100644
--- a/airgun/entities/virtwho_configure.py
+++ b/airgun/entities/virtwho_configure.py
@@ -64,7 +64,10 @@ def edit(self, name, values):
         values = self._reset_values(values)
         view.fill(values)
         view.submit.click()
-        view.flash.assert_message(f"Success alert: Successfully updated {name}.")
+        if 'name' in values:
+            view.flash.assert_message(f"Success alert: Successfully updated {values['name']}.")
+        else:
+            view.flash.assert_message(f"Success alert: Successfully updated {name}.")
         view.flash.assert_no_error()
         view.flash.dismiss()