diff --git a/packages/assistify-help-request/client/views/sideNav/AssistifyCreateRequest.js b/packages/assistify-help-request/client/views/sideNav/AssistifyCreateRequest.js
index 0c552a659c38..752c3dd3e1d1 100755
--- a/packages/assistify-help-request/client/views/sideNav/AssistifyCreateRequest.js
+++ b/packages/assistify-help-request/client/views/sideNav/AssistifyCreateRequest.js
@@ -58,10 +58,10 @@ Template.AssistifyCreateRequest.events({
 					console.log(err);
 					switch (err.error) {
 						case 'error-invalid-name':
-							toastr.error(TAPi18n.__('Invalid_room_name', name));
+							toastr.error(TAPi18n.__('Invalid_room_name', `${ expertise }...`));
 							return;
 						case 'error-duplicate-channel-name':
-							toastr.error(TAPi18n.__('Duplicate_channel_name', name));
+							toastr.error(TAPi18n.__('Request_already_exists'));
 							return;
 						case 'error-archived-duplicate-name':
 							toastr.error(TAPi18n.__('Duplicate_archived_channel_name', name));
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
index 38a1b3c674a9..8a46a2ae4f05 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.js
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -170,7 +170,7 @@ Template.channelSettings.onCreated(function() {
 			},
 			save(value, room) {
 				let nameValidation;
-				if (!RocketChat.authz.hasAllPermission('edit-room', room._id) || (room.t !== 'c' && room.t !== 'p')) {
+				if (!RocketChat.authz.hasAllPermission('edit-room', room._id) || (room.t !== 'c' && room.t !== 'p' && room.t !== 'e' && room.t !== 'r')) {
 					return toastr.error(t('error-not-allowed'));
 				}
 				if (!RocketChat.settings.get('UI_Allow_room_names_with_special_chars')) {
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomName.js b/packages/rocketchat-channel-settings/server/functions/saveRoomName.js
index 2696e1d5f079..18c0b655c22a 100644
--- a/packages/rocketchat-channel-settings/server/functions/saveRoomName.js
+++ b/packages/rocketchat-channel-settings/server/functions/saveRoomName.js
@@ -1,7 +1,7 @@
 
 RocketChat.saveRoomName = function(rid, displayName, user, sendMessage = true) {
 	const room = RocketChat.models.Rooms.findOneById(rid);
-	if (room.t !== 'c' && room.t !== 'p') {
+	if (room.t !== 'c' && room.t !== 'p' && room.t !== 'r' && room.t !== 'e') {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', {
 			'function': 'RocketChat.saveRoomdisplayName'
 		});
diff --git a/packages/rocketchat-i18n/i18n/assistifyHelpRequest.de.i18n.yml b/packages/rocketchat-i18n/i18n/assistifyHelpRequest.de.i18n.yml
index c03da8b0073e..904616465d24 100755
--- a/packages/rocketchat-i18n/i18n/assistifyHelpRequest.de.i18n.yml
+++ b/packages/rocketchat-i18n/i18n/assistifyHelpRequest.de.i18n.yml
@@ -20,3 +20,4 @@ Search_Requests: Anfragen suchen
 Expertise: Thema
 Expertises: Themen
 Expertise_title: Titel des Themas
+Request_already_exists: Eine Anfrage mit der nächsten laufenen Nummer existiert bereits. Bitte erneut versuchen.
diff --git a/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml b/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml
index 852428d7fc49..f0b2dcaa8875 100755
--- a/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml
+++ b/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml
@@ -17,3 +17,4 @@ New_request_for_expertise: New request for topic
 Experts: Experts
 Experts_channel: Experts channel
 Search_Requests: Search requests
+Request_already_exists: A request with the next rawn number already exists. Please try again.