diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh
index 7af8a97..9b146c5 100755
--- a/auth/sample/bin/client.sh
+++ b/auth/sample/bin/client.sh
@@ -158,12 +158,17 @@
         $JAVA_AGENT showpass ${APP_FQI} ${APP_FQDN}
         ;;
     check)
+        echo "## Check Certificate"
         $JAVA_AGENT check ${APP_FQI} ${APP_FQDN}
         ;;
     validate)
         echo "## validate requested"
         $JAVA_AGENT_SELF validate 
         ;;
+    renew)
+        echo "## Renew Certificate"
+        $JAVA_AGENT place ${APP_FQI} ${APP_FQDN}
+        ;;
     bash)
         shift
         cd $LOCAL || exit
diff --git a/auth/sample/etc/org.osaaf.aaf.gui.props b/auth/sample/etc/org.osaaf.aaf.gui.props
index b6e9072..caad208 100644
--- a/auth/sample/etc/org.osaaf.aaf.gui.props
+++ b/auth/sample/etc/org.osaaf.aaf.gui.props
@@ -30,7 +30,7 @@
 aaf_gui_title=AAF
 aaf_gui_copyright=(c) 2018 AT&T Intellectual Property. All rights reserved.
 aaf_gui_theme=theme/onap
-cadi_loginpage_url=https://AAF_LOCATE_URL/AAF_NS.gui:2.0/login
+cadi_loginpage_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui:2.0/login
 
 # GUI URLS and Help URLS
 aaf_url.gui_onboard=https://wiki.onap.org/display/DW/Client+Onboarding
diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props
index 91d5338..93cfae5 100644
--- a/auth/sample/local/initialConfig.props
+++ b/auth/sample/local/initialConfig.props
@@ -41,10 +41,10 @@
 # AAF URLs 
 ################################
 aaf_locate_url=https://localhost:8095
-aaf_url=https://AAF_LOCATE_URL/%C.%AAF_NS.service:2.1
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%C.%AAF_NS.oauth:2.1/introspect
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/%C.%AAF_NS.oauth:2.1/token
-cm_url=https://AAF_LOCATE_URL/%C.%AAF_NS.cm:2.1
-gui_url=https://AAF_LOCATE_URL/%C.%AAF_NS.gui.2.1
-fs_url=https://AAF_LOCATE_URL/%C.%AAF_NS.fs.2.1
+aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1/token
+cm_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1
+gui_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui.2.1
+fs_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs.2.1