1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 3479e7081..94faf59ec 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -223,8 +223,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     private OnValueEdited onSubjectEdited = new OnValueEdited() {
 
         @Override
-        public void onValueEdited(String value) {
+        public String onValueEdited(String value) {
             xmppConnectionService.pushSubjectToConference(mConversation, value);
+            return null;
         }
     };
 
@@ -274,8 +275,12 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                         new OnValueEdited() {
 
                             @Override
-                            public void onValueEdited(String value) {
-                                xmppConnectionService.renameInMuc(mConversation, value, renameCallback);
+                            public String onValueEdited(String value) {
+                                if (xmppConnectionService.renameInMuc(mConversation, value, renameCallback)) {
+                                    return null;
+                                } else {
+                                    return getString(R.string.invalid_username);
+                                }
                             }
                         });
             }