diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.html b/packages/rocketchat-integrations/client/views/integrationsIncoming.html
index 68955e653b5d..1bc5f6e0025a 100644
--- a/packages/rocketchat-integrations/client/views/integrationsIncoming.html
+++ b/packages/rocketchat-integrations/client/views/integrationsIncoming.html
@@ -30,11 +30,7 @@
 						<div class="input-line double-col">
 							<label>{{_ "Post_as"}}</label>
 							<div>
-								{{#if data.token}}
-									<input type="text" name="username" value="{{data.username}}" readonly="readonly" />
-								{{else}}
-									<input type="text" name="username" value="{{data.username}}" />
-								{{/if}}
+								<input type="text" name="username" value="{{data.username}}" />
 								<div class="settings-description secondary-font-color">{{_ "Choose_the_username_that_this_integration_will_post_as"}}</div>
 								<div class="settings-description secondary-font-color">{{_ "Should_exists_a_user_with_this_username"}}</div>
 							</div>
diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.js b/packages/rocketchat-integrations/client/views/integrationsIncoming.js
index f255ea62ac2c..38e4ebfcc7a3 100644
--- a/packages/rocketchat-integrations/client/views/integrationsIncoming.js
+++ b/packages/rocketchat-integrations/client/views/integrationsIncoming.js
@@ -222,6 +222,7 @@ Template.integrationsIncoming.events({
 		const integration = {
 			enabled: enabled === '1',
 			channel,
+			username,
 			alias: alias !== '' ? alias : undefined,
 			emoji: emoji !== '' ? emoji : undefined,
 			avatar: avatar !== '' ? avatar : undefined,
@@ -240,8 +241,6 @@ Template.integrationsIncoming.events({
 				toastr.success(TAPi18n.__('Integration_updated'));
 			});
 		} else {
-			integration.username = username;
-
 			Meteor.call('addIncomingIntegration', integration, (err, data) => {
 				if (err) {
 					return handleError(err);
diff --git a/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js b/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js
index 9a4c4a878e4a..a888484d05c2 100644
--- a/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js
+++ b/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js
@@ -76,6 +76,11 @@ Meteor.methods({
 		}
 
 		const user = RocketChat.models.Users.findOne({ username: currentIntegration.username });
+
+		if (!user || !user._id) {
+			throw new Meteor.Error('error-invalid-post-as-user', 'Invalid Post As User', { method: 'updateIncomingIntegration' });
+		}
+
 		RocketChat.models.Roles.addUserRoles(user._id, 'bot');
 
 		RocketChat.models.Integrations.update(integrationId, {