diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 2623a10..300f0ed 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -401,7 +401,7 @@
   Block payload;
   if (requestState->status == Status::PENDING) {
     // if challenge succeeded
-    if (requestState->requestType == RequestType::NEW) {
+    if (requestState->requestType == RequestType::NEW || requestState->requestType == RequestType::RENEW) {
       auto issuedCert = issueCertificate(*requestState);
       requestState->cert = issuedCert;
       requestState->status = Status::SUCCESS;
@@ -417,7 +417,6 @@
       payload = challengetlv::encodeDataContent(*requestState);
       NDN_LOG_TRACE("Challenge succeeded. Certificate has been revoked");
     }
-    // TODO: where is renew?
   }
   else {
     payload = challengetlv::encodeDataContent(*requestState);
diff --git a/tools/ndncert-client.cpp b/tools/ndncert-client.cpp
index a6c8f2c..738c019 100644
--- a/tools/ndncert-client.cpp
+++ b/tools/ndncert-client.cpp
@@ -263,9 +263,23 @@
   }
   if (index < names.size()) {
     //names
-    std::cerr << "You selected name: " << names[index].first.toUri() << std::endl;
-    //TODO add prompt to "add suffix"
-    runNew(profile, names[index].first);
+    auto selectedName = names[index].first;
+    std::cerr << "You selected name: " << selectedName.toUri() << std::endl;
+    std::cerr << "Enter Suffix if you would like one (Enter to skip): ";
+    try {
+      std::string input;
+      getline(std::cin, input);
+      auto inputName = Name(input);
+      if (!inputName.empty()) {
+        selectedName.append(inputName);
+        std::cerr << "You are applying name: " << selectedName.toUri() << std::endl;
+      }
+    }
+    catch (const std::exception& e) {
+      std::cerr << "Your input is Invalid. Exit" << std::endl;
+      exit(0);
+    }
+    runNew(profile, selectedName);
   }
   else {
     //redirects