diff --git a/GameEngine/Alliance.php b/GameEngine/Alliance.php
index 38f87e04..c25dd21b 100644
--- a/GameEngine/Alliance.php
+++ b/GameEngine/Alliance.php
@@ -180,17 +180,28 @@
 		Function to accept an invitation
 		*****************************************/
 		private function acceptInvite($get) {
-			global $database, $session;
+			global $form, $database, $session;
 			foreach($this->inviteArray as $invite) {
 				if($invite['id'] == $get['d']) {
+				$memberlist = $database->getAllMember($invite['alliance']);
+				$alliance_info = $database->getAlliance($invite['alliance']);
+				if(count($memberlist) < $alliance_info['max']){
 					$database->removeInvitation($database->RemoveXSS($get['d']));
 					$database->updateUserField($database->RemoveXSS($invite['uid']), "alliance", $database->RemoveXSS($invite['alliance']), 1);
 					$database->createAlliPermissions($database->RemoveXSS($invite['uid']), $database->RemoveXSS($invite['alliance']), '', '0', '0', '0', '0', '0', '0', '0', '0');
 					// Log the notice
 					$database->insertAlliNotice($invite['alliance'], '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has joined the alliance.');
+				}else{
+				$accept_error = 1;
+				$max = $alliance_info['max'];
+				}
 				}
 			}
+			if($accept_error == 1){
+			$form->addError("ally_accept", "The alliance can contain only ".$max." peoples right now.");
+			}else{
 			header("Location: build.php?id=" . $get['id']);
+			}
 		}
 
 		/*****************************************
diff --git a/Templates/Build/17.tpl b/Templates/Build/17.tpl
index fe1d37fa..87a03604 100644
--- a/Templates/Build/17.tpl
+++ b/Templates/Build/17.tpl
@@ -211,6 +211,8 @@ if(isset($_POST['ft'])=='check'){
 
 	if(!$checkexist){
 		$error = '<span class="error"><b>No Coordinates selected</b></span>';
+	}elseif($getwref == $village->wid){
+		$error = '<span class="error"><b>You cannot send resources to the same village</b></span>';
 	}elseif($userAccess == '0' or $userAccess == '8' or $userAccess == '9'){
 		$error = '<span class="error"><b>Player is Banned. You cannot send resources to him.</b></span>';
     }elseif($_POST['r1']==0 && $_POST['r2']==0 && $_POST['r3']==0 && $_POST['r4']==0){
diff --git a/Templates/Build/18.tpl b/Templates/Build/18.tpl
index 969c672c..27a51288 100644
--- a/Templates/Build/18.tpl
+++ b/Templates/Build/18.tpl
@@ -62,9 +62,9 @@ echo "
         }
         ?>
 	</tr></tbody></table>
-    <?php 
+    <?php
         if($alliance->gotInvite) {
-        echo "<p class=\"error2\"></p>";
+        echo "<p class=\"error2\" style=\"color: #DD0000\">".$form->getError("ally_accept")."</p>";
         } 
     }
 include("upgrade.tpl");