diff --git a/ag/gm/include/tournament.inc.php b/ag/gm/include/tournament.inc.php
index 9d9ca5f..3c46268 100644
--- a/ag/gm/include/tournament.inc.php
+++ b/ag/gm/include/tournament.inc.php
@@ -29,6 +29,8 @@ function persistTournamentChanges($request) {
 		
 		if ($key == 'id') {
 			continue;
+		} else if ($value == "") {
+			$changes[] = $key.' = NULL';	
 		} else if ($key == 'name' || $key == 'abbrevation' || $key == 'icon' || $key == 'fruit_type') {
 			$changes[] = $key.'=\''.$value.'\'';
 		} else {
@@ -61,7 +63,7 @@ function displayTournamentForm($request, $data) {
 		<tr>
 			<td align="left">Name:</td>
 			<td>
-				<input type="text" name="name" value=<?php echo $form_data['name']; ?> />
+				<input type="text" name="name" value="<?php echo $form_data['name']; ?>" />
 			</td>
 		</tr>
 		<tr>
@@ -105,7 +107,7 @@ function displayTournamentForm($request, $data) {
 			<td>
 				<select name="excl_fusion_particip_count">
 <?php 
-					for ($i = 0; $i < 4; ++$i ) {
+					for ($i = 0; $i < 20; ++$i ) {
 						$selected = '';
 						if ( $form_data['excl_fusion_particip_count'] == $i ) {
 							$selected = ' selected';
@@ -140,7 +142,7 @@ function displayTournamentForm($request, $data) {
 			<td>Maximales Level</td>
 			<td>
 				<select name="max_level">
-					<option value="0">-</option>
+					<option value="">-</option>
 <?php 
 					for ($i = 1; $i < CHAR_MAX_LEVEL; ++$i ) {
 						$selected = '';
@@ -189,7 +191,7 @@ function displayTournamentForm($request, $data) {
 			<td>Fruchttyp</td>
 			<td>
 				<select id="input" name="fruit_type">
-					<option value="0">-</option>
+					<option value="">-</option>
 <?php
 					$types = array('Logia', 'Paramecia', 'Zoan', 'natur');
 					foreach ($types as $type) {
@@ -234,7 +236,7 @@ function displayTournamentForm($request, $data) {
 			<td>Wochentag</td>
 			<td>
 				<select id="input" name="day_of_week">
-					<option value="0">-</option>
+					<option value="">-</option>
 <?php
 				$translation = array('', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag', 'Sonntag');
 				for ($i = 1; $i < count($translation); ++$i) {
@@ -254,7 +256,7 @@ function displayTournamentForm($request, $data) {
 			<td>Tag des Monats</td>
 			<td>
 				<select id="input" name="day_of_month">
-					<option value="0">-</option>
+					<option value="">-</option>
 <?php
 				for ($i = 1; $i <= 28; ++$i) {
 					$selected = '';