diff --git a/jams-react-client/src/components/CustomizedSteppers/CustomizedSteppers.js b/jams-react-client/src/components/CustomizedSteppers/CustomizedSteppers.js
index 9bbb31dbbcd1016eb532a3405eb051ad725442ea..cfe33d535902de40f81df71877031b7a8b0b76b4 100644
--- a/jams-react-client/src/components/CustomizedSteppers/CustomizedSteppers.js
+++ b/jams-react-client/src/components/CustomizedSteppers/CustomizedSteppers.js
@@ -137,7 +137,7 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 function getSteps() {
-  return ['Create admin', 'CA Setup', 'Identity Management', 'Server parameters'];
+  return ['Create Administrator User', 'Certificate Authority Setup', 'Identity Management', 'Server Parameters'];
 }
 
 export default function CustomizedSteppers(props) {
diff --git a/jams-react-client/src/components/ServerParameters/ServerParameters.js b/jams-react-client/src/components/ServerParameters/ServerParameters.js
index fdb7ff6c9cd15e08b2775e68ed2ecea0af2aefb5..209b7d5343a5830053b01b5100f06a6d391f7b0d 100644
--- a/jams-react-client/src/components/ServerParameters/ServerParameters.js
+++ b/jams-react-client/src/components/ServerParameters/ServerParameters.js
@@ -41,7 +41,7 @@ const useStyles = makeStyles((theme) => ({
 export default function ServerParameters(props) {
 
     // Formik validation fields
-    const initialValues = {domain: ""};
+    const initialValues = {domain: window.location.origin };
     const validationSchema = Yup.object().shape({
         domain: Yup.string()
             .required("Domain is required."),