diff --git a/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java b/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
index f8d7259..f4ae707 100644
--- a/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
+++ b/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
@@ -8,6 +8,7 @@ import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.layout.HBox;
 
 import envoy.client.data.Chat;
 import envoy.client.data.LocalDB;
@@ -44,15 +45,31 @@ public class GroupCreationTab {
 
 	@FXML
 	private Button createButton;
+	
+	@FXML
+	private Button cancelButton;
 
 	@FXML
 	private TextArea groupNameField;
 
 	@FXML
 	private ListView<User> userList;
+	
+	@FXML
+	private Label errorMessageLabel;
+	
+	@FXML
+	private Button proceedDupButton;
+	
+	@FXML
+	private Button cancelDupButton;
+	
+	@FXML
+	private HBox errorProceedBox;
 
 	private LocalDB localDB;
 
+	private String name;
 	private static final EventBus eventBus = EventBus.getInstance();
 
 	@FXML
@@ -103,20 +120,37 @@ public class GroupCreationTab {
 	 */
 	@FXML
 	private void createButtonClicked() {
-		final var name = groupNameField.getText();
+		name = groupNameField.getText();
 		if (!Bounds.isValidContactName(name)) {
-			new Alert(AlertType.ERROR, "The entered group name is not valid (" + Bounds.CONTACT_NAME_PATTERN + ")").showAndWait();
+			errorMessageLabel.setPrefHeight(30);
+			errorMessageLabel.setMinHeight(30);
+			errorMessageLabel.setMaxHeight(30);
+			errorMessageLabel.setText("The group name is not valid!");
 			groupNameField.clear();
 		} else if (groupNameAlreadyPresent(name)) {
-			final var alert = new Alert(AlertType.WARNING, "You already have a group with that name.", ButtonType.OK, ButtonType.CANCEL);
-			alert.setTitle("Create Group?");
-			alert.setHeaderText("Proceed?");
-			alert.showAndWait().filter(btn -> btn == ButtonType.OK).ifPresent(btn -> createGroup(name));
+			errorMessageLabel.setPrefHeight(30);
+			errorMessageLabel.setMinHeight(30);
+			errorMessageLabel.setMaxHeight(30);
+			errorMessageLabel.setText("Name does already exist! Proceed anyways?");
+			proceedDupButton.setPrefHeight(30);
+			proceedDupButton.setMinHeight(30);
+			proceedDupButton.setMaxHeight(30);
+			cancelDupButton.setPrefHeight(30);
+			cancelDupButton.setMinHeight(30);
+			cancelDupButton.setMaxHeight(30);
+			errorProceedBox.setPrefHeight(30);
+			errorProceedBox.setMinHeight(30);
+			errorProceedBox.setMaxHeight(30);
+			createButton.setDisable(true);
+			cancelButton.setDisable(true);
 		} else {
-			new Alert(AlertType.INFORMATION, String.format("Group '%s' successfully created.", name)).showAndWait();
 			createGroup(name);
+			eventBus.dispatch(new BackEvent());
+			errorMessageLabel.setPrefHeight(0);
+			errorMessageLabel.setMinHeight(0);
+			errorMessageLabel.setMaxHeight(0);
+			groupNameField.clear();
 		}
-		eventBus.dispatch(new BackEvent());
 	}
 
 	/**
@@ -150,4 +184,44 @@ public class GroupCreationTab {
 
 	@FXML
 	private void backButtonClicked() { eventBus.dispatch(new BackEvent()); }
+	
+	@FXML
+	private void proceedOnNameDuplication() {
+		createButton.setDisable(false);
+		cancelButton.setDisable(false);
+		createGroup(name);
+		eventBus.dispatch(new BackEvent());
+		errorMessageLabel.setPrefHeight(0);
+		errorMessageLabel.setMinHeight(0);
+		errorMessageLabel.setMaxHeight(0);
+		proceedDupButton.setPrefHeight(0);
+		proceedDupButton.setMinHeight(0);
+		proceedDupButton.setMaxHeight(0);
+		cancelDupButton.setPrefHeight(0);
+		cancelDupButton.setMinHeight(0);
+		cancelDupButton.setMaxHeight(0);
+		errorProceedBox.setPrefHeight(0);
+		errorProceedBox.setMinHeight(0);
+		errorProceedBox.setMaxHeight(0);
+		groupNameField.clear();
+	}
+	
+	@FXML
+	private void cancelOnNameDuplication() {
+		createButton.setDisable(false);
+		cancelButton.setDisable(false);
+		errorMessageLabel.setPrefHeight(0);
+		errorMessageLabel.setMinHeight(0);
+		errorMessageLabel.setMaxHeight(0);
+		proceedDupButton.setPrefHeight(0);
+		proceedDupButton.setMinHeight(0);
+		proceedDupButton.setMaxHeight(0);
+		cancelDupButton.setPrefHeight(0);
+		cancelDupButton.setMinHeight(0);
+		cancelDupButton.setMaxHeight(0);
+		errorProceedBox.setPrefHeight(0);
+		errorProceedBox.setMinHeight(0);
+		errorProceedBox.setMaxHeight(0);
+		groupNameField.clear();
+	}
 }
diff --git a/client/src/main/resources/css/dark.css b/client/src/main/resources/css/dark.css
index ca98909..de35c5a 100644
--- a/client/src/main/resources/css/dark.css
+++ b/client/src/main/resources/css/dark.css
@@ -82,3 +82,8 @@
 	-fx-background-insets : 4.0, 0.0, 0.0;
 	-fx-background-radius : 2.0em;
 }
+
+#proceedButton {
+	-fx-text-fill: white;
+	-fx-background-color: transparent;
+}
diff --git a/client/src/main/resources/fxml/GroupCreationTab.fxml b/client/src/main/resources/fxml/GroupCreationTab.fxml
index 68da2dd..bd7839b 100644
--- a/client/src/main/resources/fxml/GroupCreationTab.fxml
+++ b/client/src/main/resources/fxml/GroupCreationTab.fxml
@@ -37,16 +37,23 @@
                <Insets left="10.0" right="10.0" top="5.0" />
             </VBox.margin>
          </Label>
+         <Label id="infoLabel-error" fx:id="errorMessageLabel" maxHeight="0.0" minHeight="0.0" prefHeight="0.0" textAlignment="CENTER" textFill="RED" VBox.vgrow="ALWAYS" />
+         <HBox fx:id="errorProceedBox" alignment="TOP_CENTER" maxHeight="0.0" minHeight="0.0" prefHeight="0.0" prefWidth="316.0" spacing="5.0">
+            <children>
+               <Button id="proceedButton" fx:id="proceedDupButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#proceedOnNameDuplication" prefHeight="0.0" text="Proceed" />
+               <Button id="proceedButton" fx:id="cancelDupButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#cancelOnNameDuplication" prefHeight="0.0" text="Cancel" />
+            </children>
+         </HBox>
          <HBox id="underline" alignment="TOP_CENTER" prefWidth="200.0" spacing="5.0">
             <children>
-               <Button fx:id="createButton" onAction="#createButtonClicked" maxHeight="30.0" maxWidth="-Infinity" minHeight="30.0" mnemonicParsing="false" prefHeight="30.0" text="Create" />
-               <Button maxHeight="30.0" maxWidth="-Infinity" minHeight="30.0" mnemonicParsing="false" onAction="#backButtonClicked" prefHeight="30.0" text="Cancel" />
+               <Button fx:id="createButton" maxHeight="30.0" maxWidth="-Infinity" minHeight="30.0" mnemonicParsing="false" onAction="#createButtonClicked" prefHeight="30.0" text="Create" />
+               <Button fx:id="cancelButton" maxHeight="30.0" maxWidth="-Infinity" minHeight="30.0" mnemonicParsing="false" onAction="#backButtonClicked" prefHeight="30.0" text="Cancel" />
             </children>
             <VBox.margin>
                <Insets left="10.0" right="10.0" />
             </VBox.margin>
             <padding>
-               <Insets bottom="17.0" top="5.0" />
+               <Insets bottom="10.0" top="5.0" />
             </padding>
          </HBox>
           <Label text="Select Group Members" textAlignment="CENTER" textFill="WHITE">
@@ -54,7 +61,7 @@
                <Font size="15.0" />
             </font>
             <VBox.margin>
-               <Insets top="5" bottom="5.0" />
+               <Insets bottom="5.0" top="5" />
             </VBox.margin>
          </Label>
          <ListView id="chatList" fx:id="userList" focusTraversable="false" onMouseClicked="#userListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS">