diff --git a/packages/rocketchat-internal-hubot/hubot.js b/packages/rocketchat-internal-hubot/hubot.js
index d7316a0f1597..748a8e363b6b 100644
--- a/packages/rocketchat-internal-hubot/hubot.js
+++ b/packages/rocketchat-internal-hubot/hubot.js
@@ -105,7 +105,7 @@ class RocketChatAdapter extends Hubot.Adapter {
 			if (DEBUG) { console.log(`priv ${ envelope.room }: ${ string } (${ envelope.user.id })`); }
 			return Meteor.call('sendMessage', {
 				u: {
-					username: 'rocketbot'
+					username: RocketChat.settings.get('InternalHubot_Username')
 				},
 				to: `${ envelope.user.id }`,
 				msg: string,
diff --git a/packages/rocketchat-internal-hubot/settings.js b/packages/rocketchat-internal-hubot/settings.js
index ae9b334ca0e8..31c6f07c9719 100644
--- a/packages/rocketchat-internal-hubot/settings.js
+++ b/packages/rocketchat-internal-hubot/settings.js
@@ -1,6 +1,6 @@
 RocketChat.settings.addGroup('InternalHubot', function() {
 	this.add('InternalHubot_Enabled', false, { type: 'boolean', i18nLabel: 'Enabled' });
-	this.add('InternalHubot_Username', 'rocket.cat', { type: 'string', i18nLabel: 'Username', i18nDescription: 'InternalHubot_Username_Description' });
+	this.add('InternalHubot_Username', 'rocket.cat', { type: 'string', i18nLabel: 'Username', i18nDescription: 'InternalHubot_Username_Description', 'public': true });
 	this.add('InternalHubot_ScriptsToLoad', '', { type: 'string'});
 	this.add('InternalHubot_PathToLoadCustomScripts', '', { type: 'string' });
 	// this.add('InternalHubot_reload', 'reloadInternalHubot', {
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
index d47bea352e68..5da3d242eef0 100644
--- a/packages/rocketchat-ui/client/lib/chatMessages.js
+++ b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -244,7 +244,7 @@ this.ChatMessages = class ChatMessages {
 								ts: new Date,
 								msg: TAPi18n.__('No_such_command', { command: match[1] }),
 								u: {
-									username: 'rocketbot'
+									username: RocketChat.settings.get('InternalHubot_Username')
 								},
 								private: true
 							};