diff --git a/Server/Events/Login.cs b/Server/Events/Login.cs
index 5877a0b3..06d3ca9d 100644
--- a/Server/Events/Login.cs
+++ b/Server/Events/Login.cs
@@ -43,33 +43,6 @@ namespace reallife_gamemode.Server.Events
                     }
                 }
             }           
-        }
-
-        [RemoteEvent("OnPlayerRegister")]
-        public void OnPlayerRegister(Client player, string password)
-        {
-            using (var checkUser = new Model.DatabaseContext())
-            {
-                var checkedUser = checkUser.Users.SingleOrDefault(b => b.Name == player.Name);
-                if(checkedUser == null)
-                {
-                    using (var registerUser = new Model.DatabaseContext())
-                    {
-                        var user = new Entities.User { Name = player.Name, SocialClubName = player.SocialClubName, Password = NAPI.Util.GetHashSha256(password) };
-                        registerUser.Users.Add(user);
-                        registerUser.SaveChanges();
-                    }
-                    player.TriggerEvent("registerSuccess");
-                }
-                else if (player.SocialClubName == checkedUser.SocialClubName)
-                {
-                    player.TriggerEvent("registerFail", "Dieser SocialClubAccount ist schon registriert!");
-                }
-                else if (checkedUser.Name == player.Name)
-                {
-                    player.TriggerEvent("registerFail", "Benutzername existiert schon!");
-                }                             
-            }           
-        }      
+        }          
     }   
 }
diff --git a/Server/Events/Register.cs b/Server/Events/Register.cs
new file mode 100644
index 00000000..9aef1742
--- /dev/null
+++ b/Server/Events/Register.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GTANetworkAPI;
+
+/**
+* @overview Life of German Reallife - Event Register (Register.cs)
+* @author VegaZ
+* @copyright (c) 2008 - 2018 Life of German
+*/
+
+namespace reallife_gamemode.Server.Events
+{
+    class Register : Script
+    {
+        [RemoteEvent("OnPlayerRegister")]
+        public void OnPlayerRegister(Client player, string password)
+        {
+            using (var checkUser = new Model.DatabaseContext())
+            {
+                var checkedUser = checkUser.Users.SingleOrDefault(b => b.Name == player.Name);
+                if (checkedUser == null)
+                {
+                    using (var registerUser = new Model.DatabaseContext())
+                    {
+                        var user = new Entities.User { Name = player.Name, SocialClubName = player.SocialClubName, Password = NAPI.Util.GetHashSha256(password) };
+                        registerUser.Users.Add(user);
+                        registerUser.SaveChanges();
+                    }
+                    player.TriggerEvent("registerSuccess");
+                }
+                else if (player.SocialClubName == checkedUser.SocialClubName)
+                {
+                    player.TriggerEvent("registerFail", "Dieser SocialClubAccount ist schon registriert!");
+                }
+                else if (checkedUser.Name == player.Name)
+                {
+                    player.TriggerEvent("registerFail", "Benutzername existiert schon!");
+                }
+            }
+        }
+    }
+}