diff --git a/auth/sample/etc/org.osaaf.gui.props b/auth/sample/etc/org.osaaf.gui.props
index f1a2770..66a3f4c 100644
--- a/auth/sample/etc/org.osaaf.gui.props
+++ b/auth/sample/etc/org.osaaf.gui.props
@@ -9,15 +9,15 @@
 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/com.att.aaf.gui:2.0/login
+cadi_loginpage_url=https://AAF_LOCATE_URL/AAF_NS.gui:2.0/login
 
 # GUI URLS and Help URLS
 cm_url=https://aaf.osaaf.org:8150
 gw_url=https://aaf.osaaf.org:8095
 fs_url=http://aaf.osaaf.org:8096
 
-aaf_url.gui_onboard=https://wiki.web.att.com/display/aaf/OnBoarding
-aaf_url.cuigui=https://wiki.web.att.com/display/aaf/Using+the+Command+Prompt
+aaf_url.gui_onboard=https://wiki.onap.org/display/DW/Client+Onboarding
+# aaf_url.cuigui=https://???/Using+the+Command+Prompt
 
 aaf_url.aaf_help=https://wiki.onap.org/display/DW/Application+Authorization+Framework+Documentation
 aaf_url.aaf_help.sub=Bootstrapping+AAF,Installation+Guide
diff --git a/auth/sample/etc/org.osaaf.orgs.props b/auth/sample/etc/org.osaaf.orgs.props
index 66bfd2f..f421059 100644
--- a/auth/sample/etc/org.osaaf.orgs.props
+++ b/auth/sample/etc/org.osaaf.orgs.props
@@ -2,8 +2,8 @@
 # Define Organizations for use in some of the components.  Not all use them
 #
 Organization.org.osaaf=org.onap.aaf.org.DefaultOrg
-org.osaaf.mailHost=smtp.mail.att.com
-org.osaaf.mailFrom=DL-aaf-support@aaf.att.com
+org.osaaf.mailHost=smtp.mail.YOUR.ORG
+org.osaaf.mailFrom=YOUR@EMAIL
 org.osaaf.default=true
 org.osaaf.also_supports=org.osaaf.people