diff --git a/CHANGELOG.md b/CHANGELOG.md
index 191acca3f8..2c5e6ddaf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,8 @@
 
 ### Fixed
 
+ - Fixed tooltips that were previously rendering 'undefined' as their message [#552](https://github.com/portagenetwork/roadmap/issues/552)
+
  - Patched a validation check to enable updates for all existing DMP Assistant Orgs [#587](https://github.com/portagenetwork/roadmap/issues/587)
 
  - Fix duplicate guidance choices [#560](https://github.com/portagenetwork/roadmap/issues/560)
diff --git a/app/javascript/src/utils/requiredField.js b/app/javascript/src/utils/requiredField.js
index 6bb826a509..7a1112aeda 100644
--- a/app/javascript/src/utils/requiredField.js
+++ b/app/javascript/src/utils/requiredField.js
@@ -1,7 +1,7 @@
 import getConstant from './constants';
 import { isObject } from './isType';
 
-const asterisk = `<span class="red" title="${getConstant('REQUIRED_FIELD_TEXT')}">* </span>`;
+var asterisk;
 
 export const addAsterisk = (el) => {
   const target = $(el);
@@ -32,5 +32,6 @@ export const addAsterisks = (el) => {
 };
 
 $(() => {
+  asterisk = `<span class="red" title="${getConstant('REQUIRED_FIELD_TEXT')}">* </span>`;
   addAsterisks('body');
 });
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index bf3df12f47..8f09a35275 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -133,6 +133,7 @@
       MAX_NUMBER_GUIDANCE_SELECTIONS: 6,
 
       REQUIRED_FIELD_TEXT: _('This field is required.'),
+      VALIDATION_MESSAGE_PASSWORDS_MATCH: _('The passwords must match.'),
 
       SHOW_PASSWORD_MESSAGE: _('Show password'),
       SHOW_SELECT_ORG_MESSAGE: _('Select an organisation from the list.'),