diff --git a/scm/plugin.jelly b/scm/plugin.jelly
index ea179f42..e6a81d56 100644
--- a/scm/plugin.jelly
+++ b/scm/plugin.jelly
@@ -203,18 +203,26 @@
     <j:if test="${tag_name != null}">
       <ant:echo>DEPREACTED: Using tag_name directly is deprecated. Please use maven.scm.tag</ant:echo>
       <j:set var="maven.scm.tag" value="${tag_name}" />
+      <j:unset var="tag_name" />
     </j:if>
 
-    <i:ask
-      question="What is the new tag name?"
-      answer="tag_name"
-      default="${maven.scm.tag}"
-    />
-    <i:ask
-      question="What is the new version?"
-      answer="version_name"
-      default="${tag_name}"
-    />
+    <j:set var="tag_name" value="${maven.scm.tag}" />
+    <j:if test="${empty(tag_name)}">
+      <i:ask
+        question="What is the new tag name?"
+        answer="tag_name"
+        default="${maven.scm.tag}"
+      />
+    </j:if>
+
+    <j:set var="version_name" value="${maven.scm.version}" />
+    <j:if test="${empty(version_name)}">
+      <i:ask
+        question="What is the new version?"
+        answer="version_name"
+        default="${tag_name}"
+      />
+    </j:if>
 
     <!-- TODO: verify that the name is valid for a tag -->