diff --git a/.gitignore b/.gitignore
index 4510d84b7..fc855a3a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ package-lock.json
 index.php
 .DS_Store
 static/.DS_Store
+vendor
+composer.lock
\ No newline at end of file
diff --git a/.htaccess b/.htaccess
index 66a37f293..c81b3e212 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,3 +5,5 @@ RewriteRule ^gym_data$ gym_data.php?$1 [QSA,L]
 RewriteRule ^motd_data$ motd_data.php?$1 [QSA,L]
 RewriteRule ^weather_data$ weather_data.php?$1 [QSA,L]
 RewriteRule ^serviceWorker.min.js$ static/dist/js/serviceWorker.min.js?$1 [QSA,L]
+RewriteRule ^user$ user.php?$1 [QSA,L]
+RewriteRule ^discord-login$ discord-login.php?$1 [QSA,L]
\ No newline at end of file
diff --git a/DiscordAuth.php b/DiscordAuth.php
new file mode 100644
index 000000000..67ec2dfe6
--- /dev/null
+++ b/DiscordAuth.php
@@ -0,0 +1,79 @@
+<?php
+
+require_once("config/config.php");
+require_once("DiscordRedirector.php");
+use EasyBib\OAuth2\Client\AuthorizationCodeGrant\ClientConfig;
+use EasyBib\OAuth2\Client\AuthorizationCodeGrant\ServerConfig;
+use EasyBib\OAuth2\Client\AuthorizationCodeGrant\AuthorizationCodeSession;
+use EasyBib\OAuth2\Client\AuthorizationCodeGrant\Authorization\AuthorizationResponse;
+use EasyBib\OAuth2\Client\Scope;
+use GuzzleHttp\Client;
+
+class DiscordAuth
+{
+    protected $oauthSession;
+    protected $resource;
+
+    protected function setUpOAuth()
+    {
+        $httpClient = new Client(['base_uri' => 'https://discordapp.com']);
+        $redirector = new DiscordRedirector($this);
+
+        global $discordBotClientId, $discordBotClientSecret, $discordBotRedirectUri;
+
+        $clientConfig = new ClientConfig([
+            'client_id' => $discordBotClientId,
+            'client_secret' => $discordBotClientSecret,
+            'redirect_uri' => $discordBotRedirectUri
+        ]);
+
+        $serverConfig = new ServerConfig([
+            'authorization_endpoint' => '/api/oauth2/authorize',
+            'token_endpoint' => '/api/oauth2/token',
+        ]);
+
+        $this->oauthSession = new AuthorizationCodeSession(
+            $httpClient,
+            $redirector,
+            $clientConfig,
+            $serverConfig
+        );
+
+        $scope = new Scope(['identify']);
+        $this->oauthSession->setScope($scope);
+    }
+
+    public function gotoDiscord()
+    {
+        $this->setUpOAuth();
+        return $this->oauthSession->authorize();
+    }
+
+    public function handleAuthorizationResponse()
+    {
+        $this->setUpOAuth();
+        $authorizationResponse = new AuthorizationResponse($_GET);
+        $this->oauthSession->handleAuthorizationResponse($authorizationResponse);
+    }
+
+    private function setUpResource()
+    {
+        if ($this->resource != null) {
+            return $this->resource;
+        }
+        $handler = \GuzzleHttp\HandlerStack::create();
+        $handler->before('http_errors', function ($callable) {
+            return new \EasyBib\Guzzle\BearerAuthMiddleware($callable, $this->oauthSession);
+        });
+        $this->resource = new \GuzzleHttp\Client([
+            'base_uri' => 'https://discordapp.com',
+            'handler' => $handler,
+        ]);
+    }
+
+    public function get($uri)
+    {
+        $this->setUpResource();
+        return $this->resource->get($uri)->getBody()->getContents();
+    }
+}
diff --git a/DiscordRedirector.php b/DiscordRedirector.php
new file mode 100644
index 000000000..ce585b673
--- /dev/null
+++ b/DiscordRedirector.php
@@ -0,0 +1,18 @@
+<?php
+
+require_once("vendor/autoload.php");
+use EasyBib\OAuth2\Client\AuthorizationCodeGrant\RedirectorInterface;
+
+class DiscordRedirector implements RedirectorInterface
+{
+    private $controller;
+
+    public function __construct()
+    {
+    }
+
+    public function redirect($url)
+    {
+        return header("Location: $url");
+    }
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 000000000..6ddced72a
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,7 @@
+{
+    "name": "Discord Login",
+    "description": "Discord Login for PMSF",
+    "require": {
+        "easybiblabs/oauth2-client-php": "^4.1"
+    }
+}
\ No newline at end of file
diff --git a/config/default.php b/config/default.php
index f034d6b50..d7a137a46 100644
--- a/config/default.php
+++ b/config/default.php
@@ -76,28 +76,103 @@
 $motdTitle = "";
 $motdContent = "";
 
+//-----------------------------------------------------
+// Login
+//-----------------------------------------------------
+
+$noNativeLogin = true;                                              // true/false - This will enable the built in login system.
+$domainName = '';                                                   // If this is empty, reset-password emails will use the domain name taken from the URL.
+                                                                    
+$noDiscordLogin = true;                                             // true/false - This will enable login through discord.
+                                                                    // 1. Create a discord bot here -> https://discordapp.com/developers/applications/me
+                                                                    // 2. Install composer with "apt-get install composer".
+                                                                    // 3. Navigate to your website's root folder and type "composer install" to install the dependencies.
+                                                                    // 4. Add your callback-page as a REDIRECT URI to your discord bot. Should be the same as $discordBotRedirectUri.
+                                                                    // 5. Enter Client ID, Client Secret and Redirect URI below.
+$discordBotClientId = 0;
+$discordBotClientSecret = "";
+$discordBotRedirectUri = "https://example.com/discord-callback.php";
+
+$adminUsers = array('admin@example.com', 'Superadmin#13337');       // You can add multiple admins by adding them to the array.
+$logfile = '../members.log';                                        // Path to log file. Make sure this works as it will be your life saver if your db crashes.
+$daysMembershipPerQuantity = 31;                                    // How many days membership one selly quantity will give.
+$sellyPage = '';                                                    // Link to selly purchase page for membership renewal.
+$sellyWebhookSecret = '';                                           // Add a secret key at https://selly.gg/settings to make sure the payment webhook is sent from selly to prevent fake payments.
+                                                                    // Add the same key to the $sellyWebhookSecret variable.
+
 //-----------------------------------------------------
 // FRONTEND SETTINGS
 //-----------------------------------------------------
 
+if ($noNativeLogin === true && $noDiscordLogin == true ||  (($noNativeLogin === false || $noDiscordLogin === false) && !empty($_SESSION['user']->expire_timestamp) && $_SESSION['user']->expire_timestamp > time())) {
+
+    /*
+        THESE SETTINGS WILL BE APPLIED IF:
+            - LOGIN IS DISABLED
+            - LOGIN IS ENABLED AND THE USER IS LOGGED ON
+    */
+
+    /* Marker Settings */
+    $noExcludeMinIV = false;                                        // true/false
+    $noMinIV = false;                                               // true/false
+    $noMinLevel = false;                                            // true/false
+    $noHighLevelData = false;                                       // true/false
+
+    /* Notification Settings */
+    $noNotifyPokemon = false;                                       // true/false
+    $noNotifyRarity = false;                                        // true/false
+    $noNotifyIv = false;                                            // true/false
+    $noNotifyLevel = false;                                         // true/false
+    $noNotifyRaid = false;                                          // true/false
+    $noNotifySound = false;                                         // true/false
+    $noCriesSound = false;                                          // true/false
+    $noNotifyBounce = false;                                        // true/false
+    $noNotifyNotification = false;                                  // true/false
+
+    /* Style Settings */
+    $iconNotifySizeModifier = 15;                                   // 0, 15, 30, 45
+} else {
+
+    /*
+        THESE SETTINGS WILL BE APPLIED IF:
+            - LOGIN IS ENABLED AND THE USER IS NOT A DONATOR
+    */
+
+    /* Marker Settings */
+    $noExcludeMinIV = true;                                         // true/false
+    $noMinIV = true;                                                // true/false
+    $noMinLevel = true;                                             // true/false
+    $noHighLevelData = true;                                        // true/false
+
+    /* Notification Settings */
+    $noNotifyPokemon = true;                                        // true/false
+    $noNotifyRarity = true;                                         // true/false
+    $noNotifyIv = true;                                             // true/false
+    $noNotifyLevel = true;                                          // true/false
+    $noNotifyRaid = true;                                           // true/false
+    $noNotifySound = true;                                          // true/false
+    $noCriesSound = true;                                           // true/false
+    $noNotifyBounce = true;                                         // true/false
+    $noNotifyNotification = true;                                   // true/false
+
+    /* Style Settings */
+    $iconNotifySizeModifier = 0;                                    // 0, 15, 30, 45
+}
+
 /* Marker Settings */
 
 $noPokemon = false;                                                 // true/false
 $enablePokemon = 'true';                                            // true/false
 $noPokemonNumbers = false;                                          // true/false
-$noHighLevelData = false;                                           // true/false
 $noHidePokemon = false;                                             // true/false
 $hidePokemon = '[10, 13, 16, 19, 21, 29, 32, 41, 46, 48, 50, 52, 56, 74, 77, 96, 111, 133,
                   161, 163, 167, 177, 183, 191, 194, 168]';         // [] for empty
-$hidePokemonCoords = true;                                          // true/false
 
-$noExcludeMinIV = false;                                            // true/false
+$hidePokemonCoords = false;                                         // true/false
+
 $excludeMinIV = '[131, 143, 147, 148, 149, 248]';                   // [] for empty
 
-$noMinIV = false;                                                   // true/false
 $minIV = '0';                                                       // "0" for empty or a number
-
-$noMinLevel = false;                                                // true/false
 $minLevel = '0';                                                    // "0" for empty or a number
 
 $noBigKarp = false;                                                 // true/false
@@ -148,31 +223,22 @@
 
 /* Notification Settings */
 
-$noNotifyPokemon = false;                                           // true/false
 $notifyPokemon = '[201]';                                           // [] for empty
 
-$noNotifyRarity = false;                                            // true/false
 $notifyRarity = '[]';                                               // "Common", "Uncommon", "Rare", "Very Rare", "Ultra Rare"
 
-$noNotifyIv = false;                                                // true/false
 $notifyIv = '""';                                                   // "" for empty or a number
 
-$noNotifyLevel = false;                                             // true/false
 $notifyLevel = '""';                                                // "" for empty or a number
 
-$noNotifyRaid = false;                                              // true/false
 $notifyRaid = 5;                                                    // O to disable
 
-$noNotifySound = false;                                             // true/false
 $notifySound = 'false';                                             // true/false
 
-$noCriesSound = false;                                              // true/false
 $criesSound = 'false';                                              // true/false
 
-$noNotifyBounce = false;                                            // true/false
 $notifyBounce = 'true';                                             // true/false
 
-$noNotifyNotification = false;                                      // true/false
 $notifyNotification = 'true';                                       // true/false
 
 /* Style Settings */
@@ -189,7 +255,6 @@
 $iconSize = 0;                                                      // -8, 0, 10, 20
 
 $noIconNotifySizeModifier = false;                                  // true/false | Increase size of notified Pokemon
-$iconNotifySizeModifier = 15;                                       // 0, 15, 30, 45
 
 $noGymStyle = false;                                                // true/false
 $gymStyle = 'ingame';                                               // ingame, shield
diff --git a/config/example.config.php b/config/example.config.php
index 0b73bb85d..4f6315c1a 100644
--- a/config/example.config.php
+++ b/config/example.config.php
@@ -65,29 +65,103 @@
 $motdTitle = "Message of the Day";
 $motdContent = "This is an example MOTD<br>Do whatever you like with it.";
 
+//-----------------------------------------------------
+// Login
+//-----------------------------------------------------
+
+$noNativeLogin = true;                                              // true/false - This will enable the built in login system.
+$domainName = '';                                                   // If this is empty, reset-password emails will use the domain name taken from the URL.
+
+$noDiscordLogin = true;                                             // true/false - This will enable login through discord.
+                                                                    // 1. Create a discord bot here -> https://discordapp.com/developers/applications/me
+                                                                    // 2. Install composer with "apt-get install composer".
+                                                                    // 3. Navigate to your website's root folder and type "composer install" to install the dependencies.
+                                                                    // 4. Add your callback-page as a REDIRECT URI to your discord bot. Should be the same as $discordBotRedirectUri.
+                                                                    // 5. Enter Client ID, Client Secret and Redirect URI below.
+$discordBotClientId = 0;
+$discordBotClientSecret = "";
+$discordBotRedirectUri = "https://example.com/discord-callback.php";
+
+$adminUsers = array('admin@example.com', 'Superadmin#13337');       // You can add multiple admins by adding them to the array.
+$logfile = '../members.log';                                        // Path to log file. Make sure this works as it will be your life saver if your db crashes.
+$daysMembershipPerQuantity = 31;                                    // How many days membership one selly quantity will give.
+$sellyPage = '';                                                    // Link to selly purchase page for membership renewal.
+$sellyWebhookSecret = '';                                           // Add a secret key at https://selly.gg/settings to make sure the payment webhook is sent from selly to prevent fake payments.
+                                                                    // Add the same key to the $sellyWebhookSecret variable.
+
 //-----------------------------------------------------
 // FRONTEND SETTINGS
 //-----------------------------------------------------
 
+if ($noNativeLogin === true && $noDiscordLogin == true ||  (($noNativeLogin === false || $noDiscordLogin === false) && !empty($_SESSION['user']->expire_timestamp) && $_SESSION['user']->expire_timestamp > time())) {
+
+    /*
+        THESE SETTINGS WILL BE APPLIED IF:
+            - LOGIN IS DISABLED
+            - LOGIN IS ENABLED AND THE USER IS LOGGED ON
+    */
+
+    /* Marker Settings */
+    $noExcludeMinIV = false;                                        // true/false
+    $noMinIV = false;                                               // true/false
+    $noMinLevel = false;                                            // true/false
+    $noHighLevelData = false;                                       // true/false
+
+    /* Notification Settings */
+    $noNotifyPokemon = false;                                       // true/false
+    $noNotifyRarity = false;                                        // true/false
+    $noNotifyIv = false;                                            // true/false
+    $noNotifyLevel = false;                                         // true/false
+    $noNotifyRaid = false;                                          // true/false
+    $noNotifySound = false;                                         // true/false
+    $noCriesSound = false;                                          // true/false
+    $noNotifyBounce = false;                                        // true/false
+    $noNotifyNotification = false;                                  // true/false
+
+    /* Style Settings */
+    $iconNotifySizeModifier = 15;                                   // 0, 15, 30, 45
+} else {
+
+    /*
+        THESE SETTINGS WILL BE APPLIED IF:
+            - LOGIN IS ENABLED AND THE USER IS _NOT_ LOGGED ON
+    */
+
+    /* Marker Settings */
+    $noExcludeMinIV = true;                                         // true/false
+    $noMinIV = true;                                                // true/false
+    $noMinLevel = true;                                             // true/false
+    $noHighLevelData = true;                                        // true/false
+
+    /* Notification Settings */
+    $noNotifyPokemon = true;                                        // true/false
+    $noNotifyRarity = true;                                         // true/false
+    $noNotifyIv = true;                                             // true/false
+    $noNotifyLevel = true;                                          // true/false
+    $noNotifyRaid = true;                                           // true/false
+    $noNotifySound = true;                                          // true/false
+    $noCriesSound = true;                                           // true/false
+    $noNotifyBounce = true;                                         // true/false
+    $noNotifyNotification = true;                                   // true/false
+
+    /* Style Settings */
+    $iconNotifySizeModifier = 0;                                    // 0, 15, 30, 45
+}
+
 /* Marker Settings */
 
 $noPokemon = false;                                                 // true/false
 $enablePokemon = 'true';                                            // true/false
 $noPokemonNumbers = false;                                          // true/false
-$noHighLevelData = false;                                           // true/false
 $noHidePokemon = false;                                             // true/false
 $hidePokemon = '[10, 13, 16, 19, 21, 29, 32, 41, 46, 48, 50, 52, 56, 74, 77, 96, 111, 133,
                   161, 163, 167, 177, 183, 191, 194, 168]';         // [] for empty
 
 $hidePokemonCoords = false;                                         // true/false
 
-$noExcludeMinIV = false;                                            // true/false
 $excludeMinIV = '[131, 143, 147, 148, 149, 248]';                   // [] for empty
 
-$noMinIV = false;                                                   // true/false
 $minIV = '0';                                                       // "0" for empty or a number
-
-$noMinLevel = false;                                                // true/false
 $minLevel = '0';                                                    // "0" for empty or a number
 
 $noBigKarp = false;                                                 // true/false
@@ -138,31 +212,22 @@
 
 /* Notification Settings */
 
-$noNotifyPokemon = false;                                           // true/false
 $notifyPokemon = '[201]';                                           // [] for empty
 
-$noNotifyRarity = false;                                            // true/false
 $notifyRarity = '[]';                                               // "Common", "Uncommon", "Rare", "Very Rare", "Ultra Rare"
 
-$noNotifyIv = false;                                                // true/false
 $notifyIv = '""';                                                   // "" for empty or a number
 
-$noNotifyLevel = false;                                             // true/false
 $notifyLevel = '""';                                                // "" for empty or a number
 
-$noNotifyRaid = false;                                              // true/false
 $notifyRaid = 5;                                                    // O to disable
 
-$noNotifySound = false;                                             // true/false
 $notifySound = 'false';                                             // true/false
 
-$noCriesSound = false;                                              // true/false
 $criesSound = 'false';                                              // true/false
 
-$noNotifyBounce = false;                                            // true/false
 $notifyBounce = 'true';                                             // true/false
 
-$noNotifyNotification = false;                                      // true/false
 $notifyNotification = 'true';                                       // true/false
 
 /* Style Settings */
@@ -179,7 +244,6 @@
 $iconSize = 0;                                                      // -8, 0, 10, 20
 
 $noIconNotifySizeModifier = false;                                  // true/false | Increase size of notified Pokemon
-$iconNotifySizeModifier = 15;                                       // 0, 15, 30, 45
 
 $noGymStyle = false;                                                // true/false
 $gymStyle = 'ingame';                                               // ingame, shield
diff --git a/discord-callback.php b/discord-callback.php
new file mode 100644
index 000000000..4c28562fa
--- /dev/null
+++ b/discord-callback.php
@@ -0,0 +1,47 @@
+<?php
+
+require_once("config/config.php");
+require_once("DiscordAuth.php");
+
+if ($noDiscordLogin === false) {
+    try {
+        if (isset($_GET['code'])) {
+            $auth = new DiscordAuth();
+            $auth->handleAuthorizationResponse($_GET);
+            $user = json_decode($auth->get("/api/users/@me"));
+
+            $count = $db->count("users", [
+                "id" => $user->{'id'},
+                "login_system" => 'discord'
+            ]);
+
+            if ($count === 0) {
+                $db->insert("users", [
+                    "id" => $user->{'id'},
+                    "user" => $user->{'username'} . "#" . $user->{'discriminator'},
+                    "expire_timestamp" => time(),
+                    "login_system" => 'discord'
+                ]);
+
+                $logMsg = "INSERT INTO users (id, user, expire_timestamp, login_system) VALUES ('{$user->id}', '{$user->username}" . "#" . "{$user->discriminator}', '" . time() ."', 'discord'); -- " . date('Y-m-d H:i:s') . "\r\n";
+                file_put_contents($logfile, $logMsg, FILE_APPEND);
+            }
+
+            setcookie("LoginCookie", session_id(), time()+60*60*24*7);
+
+            $db->update("users", [
+                "session_id" => session_id(),
+                "user" => $user->{'username'} . "#" . $user->{'discriminator'}
+            ], [
+                "id" => $user->{'id'},
+                "login_system" => 'discord'
+            ]);
+        }
+        header("Location: .");
+        die();
+    } catch (Exception $e) {
+        header("Location: ./discord-login");
+    }
+} else {
+    header("Location: .");
+}
diff --git a/discord-login.php b/discord-login.php
new file mode 100644
index 000000000..edf30334e
--- /dev/null
+++ b/discord-login.php
@@ -0,0 +1,12 @@
+<?php
+include('config/config.php');
+
+if ($noDiscordLogin === false) {
+    require_once "vendor/autoload.php";
+    require_once("DiscordAuth.php");
+
+    $auth = new DiscordAuth();
+    $auth->gotoDiscord();
+} else {
+    header("Location: .");
+}
diff --git a/logout.php b/logout.php
new file mode 100644
index 000000000..3c228058b
--- /dev/null
+++ b/logout.php
@@ -0,0 +1,7 @@
+<?php
+require_once './config/config.php';
+
+destroyCookiesAndSessions();
+
+header('Location: .');
+die;
diff --git a/nginx.example.conf b/nginx.example.conf
index ed982140c..43d971b86 100644
--- a/nginx.example.conf
+++ b/nginx.example.conf
@@ -7,6 +7,8 @@ server {
     rewrite ^/motd_data$ /motd_data.php?$1 last;
     rewrite ^/weather_data$ /weather_data.php?$1 last;
     rewrite ^/serviceWorker.min.js$ /static/dist/js/serviceWorker.min.js last;
+    rewrite ^/user$ /user.php?$1 last;
+    rewrite ^/discord-login$ /discord-login.php?$1 last;
 
     #charset koi8-r;
 
diff --git a/pre-index.php b/pre-index.php
index a29c08a92..b79873a3f 100644
--- a/pre-index.php
+++ b/pre-index.php
@@ -153,6 +153,41 @@ function pokemonFilterImages($noPokemonNumbers)
             <div id="currentWeather"></div>
             <?php
         } ?>
+        
+        <?php
+        if ($noNativeLogin === false || $noDiscordLogin === false) {
+            if (isset($_COOKIE["LoginCookie"])) {
+                if (validateCookie($_COOKIE["LoginCookie"]) === false) {
+                    header("Location: .");
+                }
+            }
+            if (!empty($_SESSION['user']->id)) {
+                $info = $db->query(
+                    "SELECT expire_timestamp FROM users WHERE id = :id AND login_system = :login_system", [
+                        ":id" => $_SESSION['user']->id,
+                        ":login_system" => $_SESSION['user']->login_system
+                    ]
+                )->fetch();
+
+                $_SESSION['user']->expire_timestamp = $info['expire_timestamp'];
+
+                if (!empty($_SESSION['user']->updatePwd) && $_SESSION['user']->updatePwd === 1) {
+                    header("Location: ./user");
+                    die();
+                }
+                
+                if ($info['expire_timestamp'] > time()) {
+                    $color = "green";
+                } else {
+                    $color = "red";
+                }
+
+                echo "<span style='color: {$color};'>" . substr($_SESSION['user']->user, 0, 3) . "...</span>";
+            } else {
+                echo "<a href='./user'>" . i8ln('Login') . "</a>";
+            }
+        }
+        ?>
         <a href="#stats" id="statsToggle" class="statsNav" style="float: right;"><span
                 class="label"><?php echo i8ln('Stats') ?></span></a>
     </header>
@@ -594,7 +629,7 @@ class="onoffswitch-checkbox"/>
             }
             ?>
             <?php
-            if (!$noNotifyPokemon || !$noNotifyRarity || !$noNotifyIv || !$noNotifyLevel || !$noNotifySound || !$noNotifyRaid || !$noNotifyBounce || !noNotifyNotification) {
+            if (!$noNotifyPokemon || !$noNotifyRarity || !$noNotifyIv || !$noNotifyLevel || !$noNotifySound || !$noNotifyRaid || !$noNotifyBounce || !$noNotifyNotification) {
                 echo '<h3>' . i8ln('Notification') . '</h3>
             <div>';
             }
@@ -848,6 +883,39 @@ class="onoffswitch-checkbox"/>
                 </button>
             </center>
         </div>
+        <?php
+        if (($noNativeLogin === false || $noDiscordLogin === false) && !empty($_SESSION['user']->id)) {
+            ?>
+            <div>
+                <center>
+                    <button class="settings"
+                            onclick="document.location.href='user'">
+                        <i class="fa" aria-hidden="true"></i> <?php echo i8ln('Activate Key'); ?>
+                    </button>
+                </center>
+            </div>
+            <div>
+                <center>
+                    <button class="settings"
+                            onclick="document.location.href='logout.php'">
+                        <i class="fa" aria-hidden="true"></i> <?php echo i8ln('Logout'); ?>
+                    </button>
+                </center>
+            </div><br>
+            <div><center><p>
+            <?php
+            $time = date("Y-m-d", $_SESSION['user']->expire_timestamp);
+            
+            echo $_SESSION['user']->user . "<br>";
+            if ($_SESSION['user']->expire_timestamp > time()) {
+                echo "<span style='color: green;'>" . i8ln('Membership expires on') . " {$time}</span>";
+            } else {
+                echo "<span style='color: red;'>" . i8ln('Membership expired on') . " {$time}</span>";
+            } ?>
+            </p></center></div>
+        <?php
+        }
+        ?>
     </nav>
     <nav id="stats">
         <div class="switch-container">
@@ -973,6 +1041,9 @@ class="onoffswitch-checkbox"/>
     var hidePokemonCoords = <?php echo $hidePokemonCoords === true ? 'true' : 'false' ?>;
     var directionProvider = '<?php echo $noDirectionProvider === true ? $directionProvider : 'google' ?>';
     var exEligible = <?php echo $noExEligible === true ? 'false' : $exEligible  ?>;
+    var login = <?php echo $noNativeLogin === false || $noDiscordLogin === false  ? 'true' : 'false' ?>;
+    var expireTimestamp = <?php echo isset($_SESSION['user']->expire_timestamp) ? $_SESSION['user']->expire_timestamp : 0 ?>;
+    var timestamp = <?php echo time() ?>;
 </script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js"></script>
 <script src="static/dist/js/map.common.min.js"></script>
diff --git a/raw_data.php b/raw_data.php
index 14472850e..1903fe067 100644
--- a/raw_data.php
+++ b/raw_data.php
@@ -200,5 +200,20 @@
     }
 }
 
+$d['login'] = $noNativeLogin === true && $noDiscordLogin === true ? false : true;
+if ($d['login'] === true) {
+    if (isset($_SESSION['user']->login_timestamp)) {
+        $info = $db->query(
+        "SELECT login_timestamp FROM users WHERE email = :email", [
+            ":email" => $_SESSION['user']->email
+        ]
+        )->fetch();
+
+        $d["expire_timestamp"] = (int)$_SESSION['user']->expire_timestamp;
+    } else {
+        $d["expire_timestamp"] = 0;
+    }
+}
+
 $jaysson = json_encode($d);
 echo $jaysson;
diff --git a/static/js/map.js b/static/js/map.js
index 989af2d97..cacd9eb9c 100644
--- a/static/js/map.js
+++ b/static/js/map.js
@@ -2,6 +2,9 @@
 // Global map.js variables
 //
 
+var login
+var expireTimestamp
+
 var $selectExclude
 var $selectExcludeMinIV
 var $selectPokemonNotify
@@ -549,6 +552,12 @@ function pokemonLabel(item) {
             i8ln('Moves') + ' : ' + pMove1 + ' / ' + pMove2 +
             '</div>'
     }
+    if (login === true && timestamp > expireTimestamp) {
+        details +=
+            '<div>' +
+            '<b>' + i8ln('IV stats is a donator only feature.') + '</b>' +
+            '</div>'
+    }
     if (weatherBoostedCondition !== 0) {
         details +=
             '<div>' +
@@ -595,8 +604,12 @@ function pokemonLabel(item) {
         '</div>' +
         details +
         '<div>' +
-        '<a href="javascript:excludePokemon(' + id + ')">' + i8ln('Exclude') + '</a>&nbsp&nbsp' +
-        '<a href="javascript:notifyAboutPokemon(' + id + ')">' + i8ln('Notify') + '</a>&nbsp&nbsp' +
+        '<a href="javascript:excludePokemon(' + id + ')">' + i8ln('Exclude') + '</a>&nbsp&nbsp'
+
+    if (login === true && timestamp < expireTimestamp) {
+        contentstring += '<a href="javascript:notifyAboutPokemon(' + id + ')">' + i8ln('Notify') + '</a>&nbsp&nbsp'
+    }
+    contentstring +=
         '<a href="javascript:removePokemonMarker(\'' + encounterId + '\')">' + i8ln('Remove') + '</a>&nbsp&nbsp' +
         '<a href="javascript:void(0);" onclick="javascript:toggleOtherPokemon(' + id + ');" title="' + i8ln('Toggle display of other Pokemon') + '">' + i8ln('Toggle Others') + '</a>' +
         '</div>'
@@ -1455,6 +1468,8 @@ function loadRawData() {
         timeout: 300000,
         data: {
             'timestamp': timestamp,
+            'login': login,
+            'expireTimestamp': expireTimestamp,
             'pokemon': loadPokemon,
             'lastpokemon': lastpokemon,
             'pokestops': loadPokestops,
@@ -1963,6 +1978,8 @@ function updateMap() {
         lastpokemon = result.lastpokemon
         lastslocs = result.lastslocs
         lastspawns = result.lastspawns
+        login = result.login
+        expireTimestamp = result.expireTimestamp
 
         prevMinIV = result.preMinIV
         prevMinLevel = result.preMinLevel
diff --git a/static/sass/components/_form.scss b/static/sass/components/_form.scss
index 149bf2f49..1ad85bea4 100644
--- a/static/sass/components/_form.scss
+++ b/static/sass/components/_form.scss
@@ -8,7 +8,9 @@
   input[type="password"],
   input[type="email"],
   input[type="tel"],
-  textarea {
+  textarea,
+  .select,
+  .date {
     @include vendor('appearance', 'none');
     background: _palette(border-bg);
     border-radius: _size(border-radius);
diff --git a/static/sass/layout/_user.scss b/static/sass/layout/_user.scss
new file mode 100644
index 000000000..b48f62bec
--- /dev/null
+++ b/static/sass/layout/_user.scss
@@ -0,0 +1,26 @@
+/* User */
+
+#redBox {
+  border: 2px solid red;
+  border-radius: 4px;
+}
+
+#greenBox {
+  border: 2px solid green;
+  border-radius: 4px;
+}
+
+#one-third {
+  width: 30%;
+  padding: 0;
+}
+
+#margin {
+  margin-right: 0.75em;
+  margin-left: 0.75em;
+  margin-bottom: 15px;
+}
+
+h2 {
+  margin-left: 1.25em;
+}
diff --git a/static/sass/main.scss b/static/sass/main.scss
index f0f92a1b2..19b1035d4 100644
--- a/static/sass/main.scss
+++ b/static/sass/main.scss
@@ -55,6 +55,7 @@
 @import 'layout/banner';
 @import 'layout/main';
 @import 'layout/footer';
+@import 'layout/user';
 
 @import 'pokemon-sprite';
 @import 'pokemon-raid-sprite';
diff --git a/user.php b/user.php
new file mode 100644
index 000000000..28f0ac13c
--- /dev/null
+++ b/user.php
@@ -0,0 +1,462 @@
+<?php
+
+include('config/config.php');
+?>
+<!DOCTYPE html>
+<html lang="<?= $locale ?>">
+<head>
+    <meta charset="utf-8">
+    <title><?= $title ?></title>
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-title" content="PokeMap">
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="theme-color" content="#3b3b3b">
+    <!-- Fav- & Apple-Touch-Icons -->
+    <!-- Favicon -->
+    <link rel="shortcut icon" href="static/appicons/favicon.ico"
+          type="image/x-icon">
+    <!-- non-retina iPhone pre iOS 7 -->
+    <link rel="apple-touch-icon" href="static/appicons/114x114.png"
+          sizes="57x57">
+    <!-- non-retina iPad pre iOS 7 -->
+    <link rel="apple-touch-icon" href="static/appicons/144x144.png"
+          sizes="72x72">
+    <!-- non-retina iPad iOS 7 -->
+    <link rel="apple-touch-icon" href="static/appicons/152x152.png"
+          sizes="76x76">
+    <!-- retina iPhone pre iOS 7 -->
+    <link rel="apple-touch-icon" href="static/appicons/114x114.png"
+          sizes="114x114">
+    <!-- retina iPhone iOS 7 -->
+    <link rel="apple-touch-icon" href="static/appicons/120x120.png"
+          sizes="120x120">
+    <!-- retina iPad pre iOS 7 -->
+    <link rel="apple-touch-icon" href="static/appicons/144x144.png"
+          sizes="144x144">
+    <!-- retina iPad iOS 7 -->
+    <link rel="apple-touch-icon" href="static/appicons/152x152.png"
+          sizes="152x152">
+    <!-- retina iPhone 6 iOS 7 -->
+    <link rel="apple-touch-icon" href="static/appicons/180x180.png"
+          sizes="180x180">
+    <script>
+        var token = '<?php echo (!empty($_SESSION['token'])) ? $_SESSION['token'] : ""; ?>';
+    </script>
+    <link rel="stylesheet" href="static/dist/css/app.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.0/jquery-ui.min.css">
+    <link rel="stylesheet" href="https://cdn.datatables.net/1.10.12/css/jquery.dataTables.css">
+    <script src="static/js/vendor/modernizr.custom.js"></script>
+    <!-- Toastr -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css">
+</head>
+<body id="top" style="overflow: auto;">
+<div class="wrapper">
+    <?php
+    if ($noNativeLogin === false || $noDiscordLogin === false) {
+        if (isset($_COOKIE["LoginCookie"])) {
+            validateCookie($_COOKIE["LoginCookie"]);
+        }
+        if ($noNativeLogin === true && $noDiscordLogin === false && empty($_SESSION['user']->id)) {
+            header("Location: ./discord-login");
+        }
+
+        if (isset($_POST['submitUpdatePwdBtn'])) {
+            if (!empty($_POST["password"]) && ($_POST["password"] === $_POST["repassword"])) {
+                $passwordErr = '';
+                $password = $_POST["password"];
+                
+                if (strlen($_POST["password"]) <= '5') {
+                    $passwordErr = i8ln('Your password must contain at least 6 characters!');
+                } elseif (!preg_match("#[0-9]#", $password)) {
+                    $passwordErr = i8ln('Your password must contain at least 1 number!');
+                } elseif (!preg_match("#[A-Z]#", $password)) {
+                    $passwordErr = i8ln('Your password must contain at least 1 capital letter!');
+                } elseif (!preg_match("#[a-z]#", $password)) {
+                    $passwordErr = i8ln('Your password must contain at least 1 lowercase letter!');
+                }
+            } else {
+                $passwordErr = i8ln('Your passwords didn\'t match!');
+            }
+            
+            if (empty($passwordErr)) {
+                resetUserPassword($_SESSION['user']->user, $_POST['password'], 2);
+                unset($_SESSION['user']->updatePwd);
+                
+                header("Location: .");
+                die();
+            }
+        }
+        if (isset($_POST['submitLoginBtn'])) {
+            $info = $db->query(
+                "SELECT id, user, password, expire_timestamp, temp_password FROM users WHERE user = :user AND login_system = 'native'", [
+                    ":user" => $_POST['email']
+                ]
+            )->fetch();
+
+            if (password_verify($_POST['password'], $info['password']) === true || password_verify($_POST['password'], $info['temp_password']) === true) {
+                setcookie("LoginCookie", session_id(), time()+60*60*24*7);
+
+                $db->update("users", [
+                    "Session_ID" => session_id()
+                ], [
+                    "user" => $_POST['email'],
+                    "login_system" => 'native'
+                ]);
+
+                if (password_verify($_POST['password'], $info['password']) === true) {
+                    if (!empty($info['temp_password'])) {
+                        $db->update("users", [
+                            "temp_password" => null
+                        ], [
+                            "user" => $_POST['email'],
+                            "login_system" => 'native'
+                        ]);
+                    }
+                }
+                header("Location: .");
+                die();
+            }
+        }
+        if (isset($_POST['submitCreateUserOrResetPasswordBtn'])) {
+            $count = $db->count("users", [
+                "user" => $_POST['email'],
+                "login_system" => 'native'
+            ]);
+            
+            $randomPwd = generateRandomString();
+            $message = "";
+            if ($count === 1) {
+                resetUserPassword($_POST['email'], $randomPwd, 0);
+                $subject = "[{$title}] - Password Reset";
+                
+                $message .= i8ln('Dear') . " {$_POST['email']},<br><br>";
+                $message .= i8ln('Your password has been reset') . "<br>";
+                $message .= i8ln('If you haven\'t requested a new password you can ignore this email.') . "<br>";
+                $message .= i8ln('Your old password is still working.') . "<br><br>";
+                $message .= i8ln('New password: ') . " {$randomPwd}<br><br>";
+            } else {
+                createUserAccount($_POST['email'], $randomPwd, time());
+                $subject = "[{$title}] - Welcome";
+                
+                $message .= i8ln('Dear') . " {$_POST['email']},<br><br>";
+                $message .= i8ln('Thank you for signing up.') . "<br>";
+                $message .= i8ln('Your temporary password is ') . " {$randomPwd}<br><br>";
+            }
+            
+            if ($sellyPage) {
+                $message .= i8ln('You can purchase membership on ') . "<a href='{$sellyPage}'>selly</a>.<br><br>";
+            }
+            if ($discordUrl) {
+                $message .= i8ln('For support, ask your questions in the ') . "<a href='{$discordUrl}'>" . i8ln('discord guild') . "</a>!<br><br>";
+            }
+            $message .= i8ln('Best Regards') . "<br>" . i8ln('Admin');
+            if ($title) {
+                $message .= " @ {$title}";
+            }
+                
+            !empty($domainName) ? $domainName = $domainName : $domainName = $_SERVER['SERVER_NAME'];
+            $headers = "From: no-reply@{$domainName}" . "\r\n" .
+                "Reply-To: no-reply@{$domainName}" . "\r\n" .
+                'Content-Type: text/html; charset=ISO-8859-1' . "\r\n" .
+                'X-Mailer: PHP/' . phpversion();
+
+            $sendMail = mail($_POST['email'], $subject, $message, $headers);
+
+            if (!$sendMail) {
+                http_response_code(500);
+                die("<h1>Warning</h1><p>The email has not been sent.<br>If you're an user please contact your administrator.<br>If you're an administrator install <i><b>apt-get install sendmail</b></i> and restart your web server and try again.</p><p><a href='.'>Back to Map</a> - <a href='./user?forgotPwd'>Retry</a></p>");
+            }
+            
+            header("Location: ?sentPwd");
+            die();
+        }
+        if (isset($_POST['submitUpdateUserBtn'])) {
+            $Err = '';
+            if ($_POST['email'] !== '-1' || !empty($_POST['createUserEmail'])) {
+                if ((isset($_POST['ResetPwd']) || $_POST['radioExpireDate'] > 0) && $_POST['email'] !== '-1') {
+                    if (strpos($_POST['email'], '#')) {
+                        $login_system = 'discord';
+                    } else {
+                        $login_system = 'native';
+                    }
+
+                    $info = $db->query(
+                        "SELECT user, expire_timestamp FROM users WHERE user = :user AND login_system = :login_system", [
+                            ":user" => $_POST['email'],
+                            ":login_system" => $login_system
+                        ]
+                    )->fetch();
+
+                    if (isset($_POST['ResetPwd']) && $login_system === 'native') {
+                        $resetUserPwd = generateRandomString();
+                        resetUserPassword($_POST['email'], $resetUserPwd, 1);
+                    }
+
+                    if ($_POST['radioExpireDate'] > 0) {
+                        if ($_POST['radioExpireDate'] >= 1 && $_POST['radioExpireDate'] <= 12) {
+                            if ($info['expire_timestamp'] > time()) {
+                                $newExpireTimestamp = $info['expire_timestamp'] + 60 * 60 * 24 * $daysMembershipPerQuantity * $_POST['radioExpireDate'];
+                            } else {
+                                $newExpireTimestamp = time() + 60 * 60 * 24 * $daysMembershipPerQuantity;
+                            }
+                        } else {
+                            $newExpireTimestamp = strtotime($_POST['customDate']);
+                        }
+
+                        updateExpireTimestamp($_POST['email'], $login_system, $newExpireTimestamp);
+                    }
+                } else {
+                    $Err = i8ln('No changes made.');
+                }
+
+                if (!empty($_POST['createUserEmail'])) {
+                    $createUserPwd = generateRandomString();
+                    if (createUserAccount($_POST['createUserEmail'], $createUserPwd, time()) === false) {
+                        $Err = i8ln('Email already in use.');
+                    }
+                }
+
+                if ((!isset($_POST['ResetPwd']) && $_POST['radioExpireDate'] == 0 && $_POST['email'] === '-1') && empty($_POST['createUserEmail'])) {
+                    $Err = i8ln('No changes made.');
+                }
+            } else {
+                $Err = i8ln('No changes made.');
+            }
+        }
+        if (isset($_POST['submitKey'])) {
+            $Err = '';
+            $info = $db->query(
+                "SELECT selly_id, activated, quantity FROM payments WHERE selly_id = :selly_id", [
+                    ":selly_id" => $_POST['key']
+                ]
+            )->fetch();
+
+            if (empty($info['selly_id'])) {
+                $Err = i8ln('Invalid key.');
+            } elseif ($info['activated'] === 1) {
+                $Err = i8ln('This key has already been activated.');
+            }
+        }
+
+        if (isset($_GET['account'])) {
+            ?>
+            <p><h2><?php echo "[<a href='.'>{$title}</a>] - " . i8ln('Create User / Reset Password'); ?></h2></p>
+            <form action='' method='POST'>
+                <table style='margin: 0;'>
+                    <tr>
+                        <th><?php echo i8ln('E-mail'); ?></th><td><input type="text" name="email" required></td>
+                    </tr>
+                </table>
+                <table><tr><td><input id="margin" type="submit" name="submitCreateUserOrResetPasswordBtn" value="<?php echo i8ln('Submit'); ?>"><a class='button' href='/user'><?php echo i8ln('Back'); ?></a></td></tr></table>
+            </form>
+        <?php
+        } elseif (!empty($_SESSION['user']->updatePwd)) {
+            ?>
+            <h2><?php echo "[<a href='.'>{$title}</a>] - " . i8ln('Change your password.'); ?></h2>
+            <form action='' method='POST'>
+                <table style='margin: 0;'>
+                    <tr>
+                        <th><?php echo i8ln('New password'); ?></th><td><input type="password" name="password" required></td>
+                    </tr>
+                    <tr>
+                        <th><?php echo i8ln('Confirm password'); ?></th><td><input type="password" name="repassword" required></td>
+                    </tr>
+                    <?php
+                    if (!empty($passwordErr)) {
+                        ?>
+                    <tr>
+                        <th><?php echo i8ln('Message'); ?></th>
+                        <td><input type="text" name="errMess" value="<?php echo $passwordErr; ?>" id="redBox" disabled></td>
+                    </tr>
+                    <?php
+                    } ?>
+                </table>
+                <table><tr><td><input id="margin" type="submit" name="submitUpdatePwdBtn" value="<?php echo i8ln('Submit'); ?>"><a class='button' href='./logout.php'><?php echo i8ln('Logout'); ?></a></td></tr></table>
+            </form>
+        <?php
+        } elseif (in_array(isset($_SESSION['user']->user) ? $_SESSION['user']->user : null, $adminUsers)) {
+            ?>
+            <h2><?php echo "[<a href='.'>{$title}</a>] - " . i8ln('Admin page'); ?></h2>
+            <?php
+            if (!file_exists($logfile)) {
+                if (file_put_contents($logfile, "-- " . i8ln('This is a test to make sure logging is okay.') . " " . date('Y-m-d H:i:s') ."\r\n", FILE_APPEND) == false) {
+                    echo "<h1>" . i8ln('Warning') . "</h1>" .
+                        "<p>" . i8ln('Your backup logging doesn\'t work. In case of database corruption all data may be lost.') .
+                        "<br>" . i8ln('To solve this, type') .
+                        ":<br><i><b>sudo chgrp " . exec('whoami') . " " . dirname(__DIR__) . "<br>sudo chmod g+w " . dirname(__DIR__) . "</b></i></p>";
+                }
+            } ?>
+            <form action='' method='POST'>
+                <table style='margin: 0;'>
+                    <tr>
+                        <th><?php echo i8ln('Select user'); ?></th>
+                        <td>
+                            <select name="email" class='select' required>
+                                <option value='-1'><?php echo i8ln('Select a user...'); ?></option>
+                                <?php
+                                $users = $db->select("users", [
+                                    "user"
+                                ], [
+                                    "ORDER" => [
+                                        "user" => "ASC"
+                                    ]
+                                ]);
+
+            if ($users) {
+                foreach ($users as $user) {
+                    echo "<option>{$user['user']}</option>";
+                }
+            } ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th><?php echo i8ln('Expire Date'); ?></th>
+                        <td>
+                            <label><input onclick="document.getElementById('customDate').disabled = true;" type="radio" name="radioExpireDate" value="0" checked="checked"><?php echo i8ln('No change'); ?></label>
+                            <label><input onclick="document.getElementById('customDate').disabled = true;" type="radio" name="radioExpireDate" value="1"><?php echo i8ln('1 Month'); ?></label>
+                            <label><input onclick="document.getElementById('customDate').disabled = true;" type="radio" name="radioExpireDate" value="3"><?php echo i8ln('3 Months'); ?></label>
+                            <label><input onclick="document.getElementById('customDate').disabled = true;" type="radio" name="radioExpireDate" value="6"><?php echo i8ln('6 Months'); ?></label>
+                            <label><input onclick="document.getElementById('customDate').disabled = true;" type="radio" name="radioExpireDate" value="12"><?php echo i8ln('12 Months'); ?></label>
+                            <label><input onclick="document.getElementById('customDate').disabled = false;" type="radio" name="radioExpireDate" value="100"><?php echo i8ln('Custom'); ?></label>
+                            <input class="date" type="date" name="customDate" id="customDate" value="<?php echo date('Y-m-d', time()); ?>" disabled="disabled">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th><?php echo i8ln('Reset Password'); ?></th><td><input type="checkbox" name="ResetPwd"></td>
+                    </tr>
+                    <tr>
+                        <th><?php echo i8ln('Create User'); ?></th><td><input type="text" name="createUserEmail" placeholder='<?php echo i8ln('E-mail'); ?>'></td>
+                    </tr>
+                </table>
+                <table><tr><td><input id="margin" type="submit" name="submitUpdateUserBtn" value="<?php echo i8ln('Submit'); ?>"></td></tr></table>
+            </form>
+            
+            <?php
+            if (isset($_POST['submitUpdateUserBtn'])) {
+                ?>
+                <h2><?php echo i8ln('CHANGES'); ?></h2>
+                <table style='margin: 0;'>
+                    <?php
+                    if (empty($Err)) {
+                        if (isset($_POST['submitUpdateUserBtn']) && $_POST['radioExpireDate'] > 0 && $_POST['email'] !== '-1') {
+                            ?>
+                        <tr>
+                            <th id="one-third"><?php echo $_POST['email'] . " - " . i8ln('Expire Date'); ?></th>
+                            <td><input type="text" name="infoMess" value="<?php echo date('Y-m-d', $newExpireTimestamp); ?>" id="greenBox" disabled></td>
+                        </tr>
+                        <?php
+                        }
+                        if (isset($_POST['submitUpdateUserBtn']) && isset($_POST['ResetPwd']) && $login_system === 'native' && $_POST['email'] !== '-1') {
+                            ?>
+                        <tr>
+                            <th id="one-third"><?php echo $_POST['email'] . " - " . i8ln('Password'); ?></th>
+                            <td><input type="text" name="infoMess2" value="<?php echo $resetUserPwd; ?>" id="greenBox"></td>
+                        </tr>
+                        <?php
+                        }
+                        if (isset($_POST['submitUpdateUserBtn']) && !empty($_POST['createUserEmail'])) {
+                            ?>
+                            <tr>
+                                <th id="one-third"><?php echo $_POST['createUserEmail'] . " - " . i8ln('Created Account'); ?></th>
+                                <td><input type="text" name="infoMess2" value="<?php echo $createUserPwd; ?>" id="greenBox"></td>
+                            </tr>
+                        <?php
+                        }
+                    } else {
+                        ?>
+                        <tr>
+                            <th id="one-third"><?php echo i8ln('Message'); ?></th>
+                            <td><input type="text" name="infoMess" value="<?php echo i8ln($Err); ?>" id="redBox" disabled></td>
+                        </tr>
+                        <?php
+                    } ?>
+                </table>
+            <?php
+            }
+        } elseif (!empty($_SESSION['user']->user)) {
+            ?>
+            <h2><?php echo "[<a href='.'>{$title}</a>] - " . i8ln('Activate key'); ?></h2>
+            <?php
+                if (isset($_POST['submitKey']) && empty($Err)) {
+                    if ($_SESSION['user']->expire_timestamp > time()) {
+                        $newExpireTimestamp = $_SESSION['user']->expire_timestamp + 60 * 60 * 24 * $daysMembershipPerQuantity * $info['quantity'];
+                    } else {
+                        $newExpireTimestamp = time() + 60 * 60 * 24 * $daysMembershipPerQuantity * $info['quantity'];
+                    }
+
+                    $_SESSION['user']->expire_timestamp = $newExpireTimestamp;
+
+                    $db->update("payments", [
+                        "activated" => 1
+                    ], [
+                        "selly_id" => $info['selly_id']
+                    ]);
+
+                    updateExpireTimestamp($_SESSION['user']->user, $_SESSION['user']->login_system, $newExpireTimestamp);
+                    $time = date("Y-m-d H:i", $newExpireTimestamp);
+
+                    echo "<h3><span style='color: green;'>" . i8ln('Your key has been activated!') . "<br>" . i8ln('Your account expires on: ') . $time . "</span></h3>";
+                } elseif (isset($_POST['submitKey']) && !empty($Err)) {
+                    echo "<h3><span style='color: red;'>{$Err}</span></h3>";
+                } ?>
+            <form action='' method='POST'>
+                <table style='margin: 0;'>
+                    <tr>
+                        <th><?php echo i8ln('Selly Order ID'); ?></th><td><input type="text" name="key" required placeholder="123a4b5c-de67-8901-f234-5g6789801h23"></td>
+                    </tr>
+                    <tr>
+                        
+                    </tr>
+                </table>
+                <table><tr><td><input id="margin" type="submit" name="submitKey" value="<?php echo i8ln('Submit'); ?>"><?php if ($sellyPage) {
+                    echo "<a class='button' target='_TAB' id='margin' href='{$sellyPage}'>" . i8ln('Extend Membership') . "</a>";
+                } ?><a class='button' id="margin" href='.'><?php echo i8ln('Back to map'); ?></a></td></tr></table>
+            </form>
+        <?php
+        } else {
+            ?>
+            <p><h2><?php echo "[<a href='.'>{$title}</a>] - " . i8ln('Login'); ?></h2></p>
+            <form action='' method='POST'>
+                <table style='margin: 0;'>
+                    <tr>
+                        <th><?php echo i8ln('E-mail'); ?></th><td><input type="text" name="email" required <?php if (isset($_POST['submitLoginBtn'])) {
+                echo "value='$_POST[email]'";
+            } ?> placeholder="<?php echo i8ln('E-mail'); ?>"></td>
+                    </tr>
+                    <tr>
+                        <th><?php echo i8ln('Password'); ?></th><td><input type="password" name="password" required placeholder="<?php echo i8ln('Password'); ?>"></td>
+                    </tr>
+                    <?php
+                    if (isset($_POST['submitLoginBtn']) && password_verify($_POST['password'], $info['password']) !== 1) {
+                        ?>
+                        <tr>
+                            <th><?php echo i8ln('Message'); ?></th>
+                            <td><input type="text" name="infoMess" value="<?php echo i8ln('Wrong credentials'); ?>" id="redBox" disabled></td>
+                        </tr>
+                    <?php
+                    } elseif (isset($_GET['sentPwd'])) {
+                        ?>
+                        <tr>
+                            <th><?php echo i8ln('Message'); ?></th>
+                            <td><input type="text" name="infoMess" value="<?php echo i8ln('An email has been sent to the specified email.'); ?>" id="greenBox" disabled></td>
+                        </tr>
+                    <?php
+                    } ?>
+                </table>
+                <table><tr><td><input id="margin" type="submit" name="submitLoginBtn" value="<?php echo i8ln('Submit'); ?>"><a class='button' id="margin" href='?account'><?php echo i8ln('Create User / Reset Password'); ?></a><?php if ($noDiscordLogin === false) {
+                        echo "<a class='button' id='margin' href='./discord-login'>" . i8ln('Login with Discord') . "</a>";
+                    } ?> <a class='button' id='margin' href='.'><?php echo i8ln('Back to Map'); ?></a></td></tr></table>
+            </form>
+       <?php
+        }
+    } else {
+        header("Location: .");
+    }
+    ?>
+</div>
+</body>
+</html>
diff --git a/utils.php b/utils.php
index 6ced134ef..587f8b893 100644
--- a/utils.php
+++ b/utils.php
@@ -59,3 +59,163 @@ function validateToken($token)
         return false;
     }
 }
+
+function generateRandomString($length = 8)
+{
+    $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    $charactersLength = strlen($characters);
+    $randomString = '';
+    for ($i = 0; $i < $length; $i++) {
+        $randomString .= $characters[rand(0, $charactersLength - 1)];
+    }
+    return $randomString;
+}
+
+function createUserAccount($user, $password, $newExpireTimestamp)
+{
+    global $db, $logfile;
+
+    $count = $db->count("users", [
+        "user" => $user,
+        "login_system" => 'native'
+    ]);
+
+    if ($count === 0) {
+        $getId = $db->count("users", [
+            "login_system" => 'native'
+        ]);
+
+        if (is_int($getId)) {
+            $getId++;
+
+            $hashedPwd = password_hash($password, PASSWORD_DEFAULT);
+            $db->insert("users", [
+                "id" => $getId,
+                "user" => $user,
+                "temp_password" => $hashedPwd,
+                "expire_timestamp" => $newExpireTimestamp,
+                "login_system" => 'native'
+            ]);
+            
+            $logMsg = "INSERT INTO users (id, user, expire_timestamp, login_system) VALUES ('{$getId}', '{$user}', '{$newExpireTimestamp}', 'native'); -- " . date('Y-m-d H:i:s') . "\r\n";
+            file_put_contents($logfile, $logMsg, FILE_APPEND);
+
+            return true;
+        } else {
+            return false;
+        }
+    } else {
+        return false;
+    }
+}
+
+function resetUserPassword($user, $password, $resetType)
+{
+    global $db, $logfile;
+    
+    $hashedPwd = password_hash($password, PASSWORD_DEFAULT);
+    if ($resetType === 0) {
+        $db->update("users", [
+            "temp_password" => $hashedPwd
+        ], [
+            "user" => $user,
+            "login_system" => 'native'
+        ]);
+    } elseif ($resetType === 1) {
+        $db->update("users", [
+            "password" => null,
+            "temp_password" => $hashedPwd
+        ], [
+            "user" => $user,
+            "login_system" => 'native'
+        ]);
+    } else {
+        $db->update("users", [
+            "password" => $hashedPwd,
+            "temp_password" => null
+        ], [
+            "user" => $user,
+            "login_system" => 'native'
+        ]);
+    }
+
+    return true;
+}
+
+function updateExpireTimestamp($user, $login_system, $newExpireTimestamp)
+{
+    global $db, $logfile;
+
+    $db->update("users", [
+        "expire_timestamp" => $newExpireTimestamp
+    ], [
+        "user" => $user,
+        "login_system" => $login_system
+    ]);
+
+    $logMsg = "UPDATE users SET expire_timestamp = '{$newExpireTimestamp}' WHERE user = '{$user}' AND login_system = '{$login_system}'; -- " . date('Y-m-d H:i:s') . "\r\n";
+    file_put_contents($logfile, $logMsg, FILE_APPEND);
+
+    return true;
+}
+
+function destroyCookiesAndSessions()
+{
+    global $db;
+    
+    $db->update("users", [
+        "session_id" => null
+    ], [
+        "id" => $_SESSION['user']->id,
+        "login_system" => $_SESSION['user']->login_system
+    ]);
+
+    unset($_SESSION);
+    unset($_COOKIE['LoginCookie']);
+    setcookie("LoginCookie", "", time()-3600);
+    session_destroy();
+    session_write_close();
+}
+
+function validateCookie($cookie)
+{
+    global $db;
+    $info = $db->query(
+        "SELECT id, user, password, login_system, expire_timestamp FROM users WHERE session_id = :session_id", [
+            ":session_id" => $cookie
+        ]
+    )->fetch();
+
+    if (!empty($info['user'])) {
+        $_SESSION['user'] = new \stdClass();
+        $_SESSION['user']->id = $info['id'];
+        $_SESSION['user']->user = $info['user'];
+        $_SESSION['user']->login_system = $info['login_system'];
+        $_SESSION['user']->expire_timestamp = $info['expire_timestamp'];
+        
+        if (empty($info['password']) && $info['login_system'] == 'native') {
+            $_SESSION['user']->updatePwd = 1;
+        }
+        setcookie("LoginCookie", $cookie, time()+60*60*24*7);
+        return true;
+    } else {
+        destroyCookiesAndSessions();
+        return false;
+    }
+}
+
+if (!function_exists('getallheaders')) 
+{
+    function getallheaders() 
+    {
+        $headers = array (); 
+        foreach ($_SERVER as $name => $value) 
+        {
+            if (substr($name, 0, 5) == 'HTTP_') 
+            { 
+                $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value; 
+            }
+        }
+        return $headers; 
+    }
+}
diff --git a/wh.php b/wh.php
new file mode 100644
index 000000000..673a65e7a
--- /dev/null
+++ b/wh.php
@@ -0,0 +1,32 @@
+<?php
+include('config/config.php');
+
+$json = json_decode(file_get_contents('php://input'), true);
+
+$id = !empty($json["id"]) ? $json["id"] : null;
+$product_id = !empty($json["product_id"]) ? $json["product_id"] : null;
+$email = !empty($json["email"]) ? $json["email"] : null;
+$value = !empty($json["value"]) ? $json["value"] : null;
+$quantity = !empty($json["quantity"]) ? $json["quantity"] : null;
+$timestamp = time();
+
+if (($noNativeLogin === false || $noDiscordLogin === false) && !empty($id) && !empty($product_id) && !empty($email) && !empty($value) && !empty($quantity)) {
+    $signatureFromHeader = getallheaders();
+    $signature = hash_hmac('sha512', file_get_contents('php://input'), $sellyWebhookSecret);
+
+    if (hash_equals($signature, $signatureFromHeader['X-Selly-Signature'])) {
+        $db->insert("payments", [
+            "selly_id" => $id,
+            "product_id" => $product_id,
+            "email" => $email,
+            "value" => $value,
+            "quantity" => $quantity,
+            "timestamp" => $timestamp
+        ]);
+
+        $logMsg = "INSERT INTO payments (selly_id, product_id, email, value, quantity, timestamp) VALUES ('{$id}', '{$product_id}', '{$email}, '{$value}, '{$quantity}, '{$timestamp}');\r\n";
+        file_put_contents($logfile, $logMsg, FILE_APPEND);
+    }
+} else {
+    header("Location: .");
+}