diff --git a/system/pages/changelog.php b/system/pages/changelog.php
index 362cc6fe..04620f81 100644
--- a/system/pages/changelog.php
+++ b/system/pages/changelog.php
@@ -61,7 +61,7 @@ else
 	}
 ?>
 <table border="0" cellspacing="1" cellpadding="4" width="100%">
-<?
+<?php
 	if($_page > 0)
 		echo '<tr><td width="100%" align="right" valign="bottom"><a href="?subtopic=changelog&page=' . ($_page - 1) . '" class="size_xxs">Previous Page</a></td></tr>';
 
diff --git a/system/pages/guilds/delete_invite.php b/system/pages/guilds/delete_invite.php
index 974d835b..df2d8bcb 100644
--- a/system/pages/guilds/delete_invite.php
+++ b/system/pages/guilds/delete_invite.php
@@ -61,6 +61,9 @@ if(empty($errors))
 			}
 		}
 	}
+	
+	if(!$guild_vice)
+		$errors[] = 'You are not a leader or vice leader of guild <b>' . $guild_name . '</b>.';
 }
 if(empty($errors))
 {
@@ -69,8 +72,6 @@ if(empty($errors))
 	if(!$player->isLoaded())
 		$errors[] = 'Player with name <b>' . $name . '</b> doesn\'t exist.';
 }
-if(!$guild_vice)
-	$errors[] = 'You are not a leader or vice leader of guild <b>' . $guild_name . '</b>.';
 
 if(empty($errors))
 {
diff --git a/system/templates/guilds.change_description.html.twig b/system/templates/guilds.change_description.html.twig
index b38b875a..4740de48 100644
--- a/system/templates/guilds.change_description.html.twig
+++ b/system/templates/guilds.change_description.html.twig
@@ -6,7 +6,7 @@ Here you can change description of your guild.<br/>
 	(max. {{ config.guild_description_lines_limit }} lines, max. {{ config.guild_description_chars_limit }} chars) <input type="submit" value="Save description"/></form><br/>
 <br/>
 <center>
-	<form action="?subtopic=guilds&guild='.$guild->getName().'&action=manager" method="post">
+	<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">
 		{{ include('buttons.back.html.twig') }}
 	</form>
 </center>
\ No newline at end of file