diff --git a/backend/create-system.php b/backend/create-system.php
index 8c6bf75..7238a8b 100644
--- a/backend/create-system.php
+++ b/backend/create-system.php
@@ -212,16 +212,16 @@ mysqli_close($link);
     </div>
 </div>
 <!-- /PREPEND EXAMPLE -->  
-           
+
+
 <!-- Text input-->
 <div class="form-group">
-  <label class="col-md-4 control-label" for="ServiceTag">System type <span style="color:red">*</span></label>  
+  <label class="col-md-4 control-label" for="sysType">System type <span style="color:red">*</span></label>  
   <div class="col-md-4">
   <input id="ServiceTag" name="ServiceTag" type="text" placeholder="" class="form-control input-md" required="">  
   </div>
 </div>
 
-
 <!-- Select Basic -->
 <div class="form-group">
   <label class="col-md-4 control-label" for="location">Location <span style="color:red">*</span></label>
@@ -234,14 +234,6 @@ mysqli_close($link);
   </div>
 </div>
 
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="WinKey">Windows key <span style="color:red">*</span></label>  
-  <div class="col-md-4">
-  <input id="WinKey" name="WinKey" type="WinKey" placeholder="" class="form-control input-md" required="">  
-  </div>
-</div>
-
 <!-- Text input-->
 <div class="form-group">
   <label class="col-md-4 control-label" for="EthMac">Mac addres <span style="color:red">*</span></label>  
@@ -255,6 +247,23 @@ mysqli_close($link);
 
         </form>
 </div>
+
+<!-- Text input-->
+<div class="form-group">
+  <label class="col-md-4 control-label" for="WinKey">Windows key <span style="color:red">*</span></label>  
+  <div class="col-md-4">
+  <input id="WinKey" name="WinKey" type="WinKey" placeholder="" class="form-control input-md" required="">  
+  </div>
+</div>
+
+<!-- Text input-->
+<div class="form-group">
+  <label class="col-md-4 control-label" for="ServiceTag">Service Tag/Serial nr<span style="color:red">*</span></label>  
+  <div class="col-md-4">
+  <input id="ServiceTag" name="ServiceTag" type="text" placeholder="" class="form-control input-md" required="">  
+  </div>
+</div>
+
 						  <!-- / CONTENT -->
 						  
 						  
diff --git a/backend/edit-system.php b/backend/edit-system.php
index 7ea7e88..3080958 100644
--- a/backend/edit-system.php
+++ b/backend/edit-system.php
@@ -49,7 +49,7 @@ if(isset($_POST["id"]) && !empty($_POST["id"])){
 
           $input_ServiceTag = trim($_POST["ServiceTag"]);
           if(empty($input_ServiceTag)){
-              $ServiceTag_err = "Please enter a Windows Key";
+              $ServiceTag_err = "Please enter a Servicetag/Serial nr";
           }  else{
               $ServiceTag = $input_ServiceTag;
           }
@@ -367,7 +367,7 @@ $lines = explode("\n", $trimmedString);
                         </div>
 
                         <div class="form-group col-md-4 <?php echo (!empty($ServiceTag_err)) ? 'has-error' : ''; ?>">
-                            <label>Service Tag</label>
+                            <label>Service Tag/Serial nr</label>
                             <input type="text" name="ServiceTag" class="form-control" value="<?php echo $ServiceTag; ?>">
                             <span class="help-block"><?php echo $ServiceTag_err;?></span>
                         </div>