diff --git a/admin/pages/mass_teleport.php b/admin/pages/mass_teleport.php
index 2aa72b8c..972975e2 100644
--- a/admin/pages/mass_teleport.php
+++ b/admin/pages/mass_teleport.php
@@ -90,8 +90,8 @@ if (isset($_POST['action']) && $_POST['action'])    {
 				admin_teleport_town($town_id);
 				break;
 			case 'set-position':
-				if ((!$posx || !$posy || !$posz) && !$to_temple) {
-					displayMessage('Please fill all inputs');
+				if (!$to_temple &&  ($posx < 0 || $posx > 65535 || $posy < 0 || $posy > 65535|| $posz < 0 || $posz > 16)) {
+					displayMessage('Invalid Position');
 					return;
 				}
 
diff --git a/system/templates/admin.tools.teleport.html.twig b/system/templates/admin.tools.teleport.html.twig
index 3a2a0110..68cc3404 100644
--- a/system/templates/admin.tools.teleport.html.twig
+++ b/system/templates/admin.tools.teleport.html.twig
@@ -37,19 +37,19 @@
 						<div class="col-md-4">
 							<div class="form-group">
 								<label>Position X</label>
-								<input type="number" name="posx" value="" class="form-control">
+								<input type="number" min="0" max="65535" required name="posx" value="" class="form-control">
 							</div>
 						</div>
 						<div class="col-md-4">
 							<div class="form-group">
 								<label>Position Y</label>
-								<input type="number" name="posy" value="" class="form-control">
+								<input type="number" min="0" max="65535" required name="posy" value="" class="form-control">
 							</div>
 						</div>
 						<div class="col-md-4">
 							<div class="form-group">
 								<label>Position Z</label>
-								<input type="number" name="posz" value="" class="form-control">
+								<input type="number" min="0" max="16" required name="posz" value="" class="form-control">
 							</div>
 						</div>
 					</div>