diff --git a/README.md b/README.md
index 2ee209b1..045210b0 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ pm2 stop ppfun-server
 
 ### If using Cloudflare / Reverse Proxy
 
-If USE\_XREALIP is set, we take the IP from the X-Real-Ip header. Use this if you have pixelplanet running behind nginx and cloudflare. Use the nginx set\_realip module to give us the client ip on the X-Real-Ip header (and set it up so that just cloudflare are trusted proxy IPs, or else players could fake their IP). And be sure to also forward X-Forwarded-Port and set X-Forwarded-Proto.
+If USE\_XREALIP is set, we take the IP from the X-Real-Ip header. Use this if you have pixelplanet running behind nginx and cloudflare. Use the nginx set\_realip module to give us the client ip on the X-Real-Ip header (and set it up so that just cloudflare are trusted proxy IPs, or else players could fake their IP). And be sure to also set X-Forwarded-Port and set X-Forwarded-Proto, because we use it for CORS and redirecion.
 
 ### Auto-Start
 To have the canvas with all it's components autostart at systemstart,
diff --git a/i18n/template-ssr.pot b/i18n/template-ssr.pot
index 45e578df..ae6858d7 100644
--- a/i18n/template-ssr.pot
+++ b/i18n/template-ssr.pot
@@ -53,6 +53,14 @@ msgstr ""
 msgid "Stop flooding."
 msgstr ""
 
+#: src/ssr-components/Main.jsx:70
+msgid "PixelPlanet.fun"
+msgstr ""
+
+#: src/ssr-components/Main.jsx:72
+msgid "Place color pixels on an map styled canvas with other players online"
+msgstr ""
+
 #: src/ssr-components/Globe.jsx:44
 msgid "Double click on globe to go back."
 msgstr ""
@@ -69,14 +77,6 @@ msgstr ""
 msgid "A 3D globe of our whole map"
 msgstr ""
 
-#: src/ssr-components/Main.jsx:70
-msgid "PixelPlanet.fun"
-msgstr ""
-
-#: src/ssr-components/Main.jsx:72
-msgid "Place color pixels on an map styled canvas with other players online"
-msgstr ""
-
 #: src/routes/reset_password.js:41
 msgid "You sent an empty password or invalid data :("
 msgstr ""
@@ -218,6 +218,26 @@ msgstr ""
 msgid "Reset your password here"
 msgstr ""
 
+#: src/routes/api/captcha.js:22
+msgid "No captcha text given"
+msgstr ""
+
+#: src/routes/api/captcha.js:36
+msgid "You took too long, try again."
+msgstr ""
+
+#: src/routes/api/captcha.js:42
+msgid "You failed your captcha"
+msgstr ""
+
+#: src/routes/api/captcha.js:48
+msgid "Unknown Captcha Error"
+msgstr ""
+
+#: src/routes/api/captcha.js:55
+msgid "Server error occured"
+msgstr ""
+
 #: src/utils/validation.js:18
 msgid "Email can't be empty."
 msgstr ""
@@ -266,26 +286,6 @@ msgstr ""
 msgid "Password must be shorter than 60 characters."
 msgstr ""
 
-#: src/routes/api/captcha.js:22
-msgid "No captcha text given"
-msgstr ""
-
-#: src/routes/api/captcha.js:36
-msgid "You took too long, try again."
-msgstr ""
-
-#: src/routes/api/captcha.js:42
-msgid "You failed your captcha"
-msgstr ""
-
-#: src/routes/api/captcha.js:48
-msgid "Unknown Captcha Error"
-msgstr ""
-
-#: src/routes/api/captcha.js:55
-msgid "Server error occured"
-msgstr ""
-
 #: src/routes/api/auth/register.js:31
 msgid "E-Mail already in use."
 msgstr ""
@@ -302,25 +302,6 @@ msgstr ""
 msgid "Failed to establish session after register :("
 msgstr ""
 
-#: src/routes/api/auth/verify.js:25
-#: src/routes/api/auth/verify.js:32
-msgid "Mail verification"
-msgstr ""
-
-#: src/routes/api/auth/verify.js:26
-msgid "You are now verified :)"
-msgstr ""
-
-#: src/routes/api/auth/verify.js:32
-msgid ""
-"Your mail verification code is invalid or already expired :(, please "
-"request a new one."
-msgstr ""
-
-#: src/routes/api/auth/logout.js:13
-msgid "You are not even logged in."
-msgstr ""
-
 #: src/routes/api/auth/change_mail.js:41
 #: src/routes/api/auth/change_passwd.js:37
 #: src/routes/api/auth/delete_account.js:38
@@ -346,6 +327,25 @@ msgstr ""
 msgid "PixelPlanet.fun Accounts"
 msgstr ""
 
+#: src/routes/api/auth/verify.js:25
+#: src/routes/api/auth/verify.js:32
+msgid "Mail verification"
+msgstr ""
+
+#: src/routes/api/auth/verify.js:26
+msgid "You are now verified :)"
+msgstr ""
+
+#: src/routes/api/auth/verify.js:32
+msgid ""
+"Your mail verification code is invalid or already expired :(, please "
+"request a new one."
+msgstr ""
+
+#: src/routes/api/auth/logout.js:13
+msgid "You are not even logged in."
+msgstr ""
+
 #: src/canvasesDesc.js:18
 msgid "Earth"
 msgstr ""
diff --git a/i18n/template.pot b/i18n/template.pot
index 8bb10e98..654f0782 100644
--- a/i18n/template.pot
+++ b/i18n/template.pot
@@ -3,48 +3,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: src/controls/keypress.js:41
-#, javascript-format
-msgid "Switched to ${ canvasName }"
-msgstr ""
-
-#: src/controls/keypress.js:64
-msgid "Grid ON"
-msgstr ""
-
-#: src/controls/keypress.js:65
-msgid "Grid OFF"
-msgstr ""
-
-#: src/controls/keypress.js:75
-msgid "Pixel Notify ON"
-msgstr ""
-
-#: src/controls/keypress.js:76
-msgid "Pixel Notify OFF"
-msgstr ""
-
-#: src/controls/keypress.js:81
-msgid "Muted Sound"
-msgstr ""
-
-#: src/controls/keypress.js:82
-msgid "Unmuted Sound"
-msgstr ""
-
-#: src/components/CoordinatesBox.jsx:29
-#: src/controls/keypress.js:88
-msgid "Copied!"
-msgstr ""
-
-#: src/controls/keypress.js:94
-msgid "Show Hidden Canvases"
-msgstr ""
-
-#: src/controls/keypress.js:95
-msgid "Hide Hidden Canvases"
-msgstr ""
-
 #: src/ui/placePixel.js:53
 msgid "Error :("
 msgstr ""
@@ -146,6 +104,48 @@ msgstr ""
 msgid "Error ${ retCode }"
 msgstr ""
 
+#: src/controls/keypress.js:41
+#, javascript-format
+msgid "Switched to ${ canvasName }"
+msgstr ""
+
+#: src/controls/keypress.js:64
+msgid "Grid ON"
+msgstr ""
+
+#: src/controls/keypress.js:65
+msgid "Grid OFF"
+msgstr ""
+
+#: src/controls/keypress.js:75
+msgid "Pixel Notify ON"
+msgstr ""
+
+#: src/controls/keypress.js:76
+msgid "Pixel Notify OFF"
+msgstr ""
+
+#: src/controls/keypress.js:81
+msgid "Muted Sound"
+msgstr ""
+
+#: src/controls/keypress.js:82
+msgid "Unmuted Sound"
+msgstr ""
+
+#: src/components/CoordinatesBox.jsx:29
+#: src/controls/keypress.js:88
+msgid "Copied!"
+msgstr ""
+
+#: src/controls/keypress.js:94
+msgid "Show Hidden Canvases"
+msgstr ""
+
+#: src/controls/keypress.js:95
+msgid "Hide Hidden Canvases"
+msgstr ""
+
 #: src/ui/renderer.js:36
 msgid "Canvas Error"
 msgstr ""
@@ -170,11 +170,6 @@ msgstr ""
 msgid "Look at past Canvases"
 msgstr ""
 
-#: src/components/Converter.jsx:559
-#: src/components/CoordinatesBox.jsx:32
-msgid "Copy to Clipboard"
-msgstr ""
-
 #: src/components/OnlineBox.jsx:41
 msgid "Online Users on Canvas"
 msgstr ""
@@ -198,6 +193,11 @@ msgstr ""
 msgid "Restore"
 msgstr ""
 
+#: src/components/Converter.jsx:559
+#: src/components/CoordinatesBox.jsx:32
+msgid "Copy to Clipboard"
+msgstr ""
+
 #: src/actions/fetch.js:39
 msgid "You made too many requests"
 msgstr ""
@@ -261,32 +261,11 @@ msgstr ""
 msgid "Select Date above"
 msgstr ""
 
-#: src/components/Window.jsx:117
-msgid "Clone"
-msgstr ""
-
-#: src/components/Window.jsx:124
-msgid "Move"
-msgstr ""
-
-#: src/components/Window.jsx:131
-msgid "Maximize"
-msgstr ""
-
-#: src/components/Window.jsx:145
-msgid "Resize"
-msgstr ""
-
 #: src/components/buttons/SettingsButton.jsx:23
 #: src/components/windows/index.js:17
 msgid "Settings"
 msgstr ""
 
-#: src/components/buttons/LogInButton.jsx:23
-#: src/components/windows/index.js:18
-msgid "User Area"
-msgstr ""
-
 #: src/components/buttons/DownloadButton.jsx:37
 msgid "Make Screenshot"
 msgstr ""
@@ -303,6 +282,27 @@ msgstr ""
 msgid "Open Palette"
 msgstr ""
 
+#: src/components/buttons/LogInButton.jsx:23
+#: src/components/windows/index.js:18
+msgid "User Area"
+msgstr ""
+
+#: src/components/Window.jsx:117
+msgid "Clone"
+msgstr ""
+
+#: src/components/Window.jsx:124
+msgid "Move"
+msgstr ""
+
+#: src/components/Window.jsx:131
+msgid "Maximize"
+msgstr ""
+
+#: src/components/Window.jsx:145
+msgid "Resize"
+msgstr ""
+
 #: src/components/contextmenus/UserContextMenu.jsx:53
 msgid "Ping"
 msgstr ""
@@ -384,6 +384,34 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
+#: src/components/windows/UserArea.jsx:27
+msgid "Profile"
+msgstr ""
+
+#: src/components/windows/UserArea.jsx:30
+msgid "Ranking"
+msgstr ""
+
+#: src/components/windows/UserArea.jsx:33
+msgid "Converter"
+msgstr ""
+
+#: src/components/windows/UserArea.jsx:39
+msgid "Admintools"
+msgstr ""
+
+#: src/components/windows/UserArea.jsx:39
+msgid "Modtools"
+msgstr ""
+
+#: src/components/windows/UserArea.jsx:40
+msgid "Loading..."
+msgstr ""
+
+#: src/components/windows/UserArea.jsx:47
+msgid "Consider joining us on Guilded:"
+msgstr ""
+
 #: src/components/windows/Help.jsx:36
 msgid "your IP"
 msgstr ""
@@ -561,6 +589,89 @@ msgstr ""
 msgid "Credit for the Palette of the Top10 canvas goes to ${ vinikLink }."
 msgstr ""
 
+#: src/components/windows/CanvasSelect.jsx:33
+msgid ""
+"Select the canvas you want to use.  Every canvas is unique and has "
+"different palettes, cooldown and requirements.  Archive of closed canvases "
+"can be accessed here:"
+msgstr ""
+
+#: src/components/windows/CanvasSelect.jsx:41
+msgid "Archive"
+msgstr ""
+
+#: src/components/windows/Archive.jsx:20
+msgid ""
+"While we tend to not delete canvases, some canvases are started for fun or "
+"as a request by users who currently like a meme. Those canvases can get "
+"boring after a while and after weeks of no major change and if they really "
+"aren't worth being kept active, we decide to remove them."
+msgstr ""
+
+#: src/components/windows/Archive.jsx:22
+msgid ""
+"Here we collect those canvases to archive them in a proper way (which is "
+"currently just one)."
+msgstr ""
+
+#: src/components/windows/Archive.jsx:24
+msgid "Political Compass Canvas"
+msgstr ""
+
+#: src/components/windows/Archive.jsx:31
+msgid ""
+"This canvas got requested during a time of political conflicts on the main "
+"Earth canvas. It was a 1024x1024 representation of the political compass "
+"with a 5s cooldown and 60s stacking. It got launched on May 11th and "
+"remained active for months till it got shut down on November 30th."
+msgstr ""
+
+#: src/components/windows/Archive.jsx:32
+msgid ""
+"We decided to archive it as a timelapse with lossless encoded webm. Taking "
+"a screenshot from the timelapse results in a perfect 1:1 representation of "
+"how the canvas was at that time."
+msgstr ""
+
+#: src/components/windows/Chat.jsx:146
+msgid "Channel settings"
+msgstr ""
+
+#: src/components/windows/Chat.jsx:161
+msgid "Start chatting here"
+msgstr ""
+
+#: src/components/windows/Chat.jsx:198
+msgid "Chat here"
+msgstr ""
+
+#: src/components/windows/Chat.jsx:221
+msgid "You must be logged in to chat"
+msgstr ""
+
+#: src/components/windows/ForgotPassword.jsx:60
+msgid "Sent you a mail with instructions to reset your password."
+msgstr ""
+
+#: src/components/windows/ForgotPassword.jsx:71
+msgid "Enter your mail address and we will send you a new password:"
+msgstr ""
+
+#: src/components/windows/ForgotPassword.jsx:82
+#: src/components/windows/Register.jsx:100
+msgid "Email"
+msgstr ""
+
+#: src/components/Admintools.jsx:311
+#: src/components/Admintools.jsx:392
+#: src/components/Admintools.jsx:467
+#: src/components/Admintools.jsx:512
+#: src/components/Admintools.jsx:595
+#: src/components/windows/ForgotPassword.jsx:86
+#: src/components/windows/Register.jsx:119
+msgid "Submit"
+msgstr ""
+
 #: src/components/windows/Settings.jsx:133
 msgid "Show Grid"
 msgstr ""
@@ -654,34 +765,6 @@ msgstr ""
 msgid "Select Language"
 msgstr ""
 
-#: src/components/windows/UserArea.jsx:27
-msgid "Profile"
-msgstr ""
-
-#: src/components/windows/UserArea.jsx:30
-msgid "Ranking"
-msgstr ""
-
-#: src/components/windows/UserArea.jsx:33
-msgid "Converter"
-msgstr ""
-
-#: src/components/windows/UserArea.jsx:39
-msgid "Admintools"
-msgstr ""
-
-#: src/components/windows/UserArea.jsx:39
-msgid "Modtools"
-msgstr ""
-
-#: src/components/windows/UserArea.jsx:40
-msgid "Loading..."
-msgstr ""
-
-#: src/components/windows/UserArea.jsx:47
-msgid "Consider joining us on Guilded:"
-msgstr ""
-
 #: src/components/windows/Register.jsx:81
 msgid "Register new account here"
 msgstr ""
@@ -690,11 +773,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: src/components/windows/ForgotPassword.jsx:82
-#: src/components/windows/Register.jsx:100
-msgid "Email"
-msgstr ""
-
 #: src/components/ChangeMail.jsx:80
 #: src/components/DeleteAccount.jsx:62
 #: src/components/LogInForm.jsx:83
@@ -706,84 +784,6 @@ msgstr ""
 msgid "Confirm Password"
 msgstr ""
 
-#: src/components/Admintools.jsx:311
-#: src/components/Admintools.jsx:392
-#: src/components/Admintools.jsx:467
-#: src/components/Admintools.jsx:512
-#: src/components/Admintools.jsx:595
-#: src/components/windows/ForgotPassword.jsx:86
-#: src/components/windows/Register.jsx:119
-msgid "Submit"
-msgstr ""
-
-#: src/components/windows/CanvasSelect.jsx:33
-msgid ""
-"Select the canvas you want to use.  Every canvas is unique and has "
-"different palettes, cooldown and requirements.  Archive of closed canvases "
-"can be accessed here:"
-msgstr ""
-
-#: src/components/windows/CanvasSelect.jsx:41
-msgid "Archive"
-msgstr ""
-
-#: src/components/windows/Archive.jsx:20
-msgid ""
-"While we tend to not delete canvases, some canvases are started for fun or "
-"as a request by users who currently like a meme. Those canvases can get "
-"boring after a while and after weeks of no major change and if they really "
-"aren't worth being kept active, we decide to remove them."
-msgstr ""
-
-#: src/components/windows/Archive.jsx:22
-msgid ""
-"Here we collect those canvases to archive them in a proper way (which is "
-"currently just one)."
-msgstr ""
-
-#: src/components/windows/Archive.jsx:24
-msgid "Political Compass Canvas"
-msgstr ""
-
-#: src/components/windows/Archive.jsx:31
-msgid ""
-"This canvas got requested during a time of political conflicts on the main "
-"Earth canvas. It was a 1024x1024 representation of the political compass "
-"with a 5s cooldown and 60s stacking. It got launched on May 11th and "
-"remained active for months till it got shut down on November 30th."
-msgstr ""
-
-#: src/components/windows/Archive.jsx:32
-msgid ""
-"We decided to archive it as a timelapse with lossless encoded webm. Taking "
-"a screenshot from the timelapse results in a perfect 1:1 representation of "
-"how the canvas was at that time."
-msgstr ""
-
-#: src/components/windows/Chat.jsx:146
-msgid "Channel settings"
-msgstr ""
-
-#: src/components/windows/Chat.jsx:161
-msgid "Start chatting here"
-msgstr ""
-
-#: src/components/windows/Chat.jsx:198
-msgid "Chat here"
-msgstr ""
-
-#: src/components/windows/Chat.jsx:221
-msgid "You must be logged in to chat"
-msgstr ""
-
-#: src/components/windows/ForgotPassword.jsx:60
-msgid "Sent you a mail with instructions to reset your password."
-msgstr ""
-
-#: src/components/windows/ForgotPassword.jsx:71
-msgid "Enter your mail address and we will send you a new password:"
-msgstr ""
-
 #: src/utils/validation.js:18
 msgid "Email can't be empty."
 msgstr ""
@@ -832,37 +832,6 @@ msgstr ""
 msgid "Password must be shorter than 60 characters."
 msgstr ""
 
-#: src/components/ChangeMail.jsx:91
-#: src/components/ChangeName.jsx:68
-#: src/components/ChangePassword.jsx:110
-#: src/components/LanguageSelect.jsx:73
-msgid "Save"
-msgstr ""
-
-#: src/components/LogInArea.jsx:21
-msgid "Login to access more features and stats."
-msgstr ""
-
-#: src/components/LogInArea.jsx:23
-msgid "Login with Name or Mail:"
-msgstr ""
-
-#: src/components/LogInArea.jsx:30
-msgid "I forgot my Password."
-msgstr ""
-
-#: src/components/LogInArea.jsx:31
-msgid "or login with:"
-msgstr ""
-
-#: src/components/LogInArea.jsx:72
-msgid "or register here:"
-msgstr ""
-
-#: src/components/LogInArea.jsx:79
-msgid "Register"
-msgstr ""
-
 #: src/components/UserAreaContent.jsx:63
 msgid "Todays Placed Pixels"
 msgstr ""
@@ -908,6 +877,18 @@ msgstr ""
 msgid "Social Settings"
 msgstr ""
 
+#: src/components/Rankings.jsx:28
+msgid "Total"
+msgstr ""
+
+#: src/components/Rankings.jsx:36
+msgid "Daily"
+msgstr ""
+
+#: src/components/Rankings.jsx:40
+msgid "Ranking updates every 5 min. Daily rankings get reset at midnight UTC."
+msgstr ""
+
 #: src/components/Admintools.jsx:184
 msgid "Build image on canvas."
 msgstr ""
@@ -986,16 +967,49 @@ msgstr ""
 msgid "User Name"
 msgstr ""
 
-#: src/components/Rankings.jsx:28
-msgid "Total"
+#: src/components/CanvasItem.jsx:30
+msgid "Online Users"
 msgstr ""
 
-#: src/components/Rankings.jsx:36
-msgid "Daily"
+#: src/components/CanvasItem.jsx:35
+msgid "Cooldown"
 msgstr ""
 
-#: src/components/Rankings.jsx:40
-msgid "Ranking updates every 5 min. Daily rankings get reset at midnight UTC."
+#: src/components/CanvasItem.jsx:41
+msgid "Stacking till"
+msgstr ""
+
+#: src/components/CanvasItem.jsx:43
+msgid "Ranked"
+msgstr ""
+
+#: src/components/CanvasItem.jsx:45
+msgid "Yes"
+msgstr ""
+
+#: src/components/CanvasItem.jsx:45
+msgid "No"
+msgstr ""
+
+#: src/components/CanvasItem.jsx:51
+msgid "Requirements"
+msgstr ""
+
+#: src/components/CanvasItem.jsx:54
+msgid "User Account"
+msgstr ""
+
+#: src/components/CanvasItem.jsx:56
+#, javascript-format
+msgid "and ${ canvas.req } Pixels set"
+msgstr ""
+
+#: src/components/CanvasItem.jsx:59
+msgid "Top 10 Daily Ranking"
+msgstr ""
+
+#: src/components/CanvasItem.jsx:65
+msgid "Dimensions"
 msgstr ""
 
 #: src/components/Converter.jsx:190
@@ -1076,57 +1090,35 @@ msgstr ""
 msgid "Download Template"
 msgstr ""
 
-#: src/components/CanvasItem.jsx:30
-msgid "Online Users"
+#: src/components/LogInArea.jsx:21
+msgid "Login to access more features and stats."
 msgstr ""
 
-#: src/components/CanvasItem.jsx:35
-msgid "Cooldown"
+#: src/components/LogInArea.jsx:23
+msgid "Login with Name or Mail:"
 msgstr ""
 
-#: src/components/CanvasItem.jsx:41
-msgid "Stacking till"
+#: src/components/LogInArea.jsx:30
+msgid "I forgot my Password."
 msgstr ""
 
-#: src/components/CanvasItem.jsx:43
-msgid "Ranked"
+#: src/components/LogInArea.jsx:31
+msgid "or login with:"
 msgstr ""
 
-#: src/components/CanvasItem.jsx:45
-msgid "Yes"
+#: src/components/LogInArea.jsx:72
+msgid "or register here:"
 msgstr ""
 
-#: src/components/CanvasItem.jsx:45
-msgid "No"
+#: src/components/LogInArea.jsx:79
+msgid "Register"
 msgstr ""
 
-#: src/components/CanvasItem.jsx:51
-msgid "Requirements"
-msgstr ""
-
-#: src/components/CanvasItem.jsx:54
-msgid "User Account"
-msgstr ""
-
-#: src/components/CanvasItem.jsx:56
-#, javascript-format
-msgid "and ${ canvas.req } Pixels set"
-msgstr ""
-
-#: src/components/CanvasItem.jsx:59
-msgid "Top 10 Daily Ranking"
-msgstr ""
-
-#: src/components/CanvasItem.jsx:65
-msgid "Dimensions"
-msgstr ""
-
-#: src/components/LogInForm.jsx:76
-msgid "Name or Email"
-msgstr ""
-
-#: src/components/LogInForm.jsx:87
-msgid "LogIn"
+#: src/components/ChangeMail.jsx:91
+#: src/components/ChangeName.jsx:68
+#: src/components/ChangePassword.jsx:110
+#: src/components/LanguageSelect.jsx:73
+msgid "Save"
 msgstr ""
 
 #: src/components/ChangePassword.jsx:22
@@ -1149,24 +1141,6 @@ msgstr ""
 msgid "Confirm New Password"
 msgstr ""
 
-#: src/components/UserMessages.jsx:28
-msgid ""
-"Please verify your mail address \n"
-"or your account could get deleted after a few days."
-msgstr ""
-
-#: src/components/UserMessages.jsx:49
-msgid "A new verification mail is getting sent to you."
-msgstr ""
-
-#: src/components/UserMessages.jsx:53
-msgid "Click here to request a new verification mail."
-msgstr ""
-
-#: src/components/ChangeName.jsx:64
-msgid "New Username"
-msgstr ""
-
 #: src/components/ChangeMail.jsx:59
 msgid ""
 "Changed Mail successfully. We sent you a verification mail,             "
@@ -1193,6 +1167,32 @@ msgstr ""
 msgid "You have no users blocked"
 msgstr ""
 
+#: src/components/UserMessages.jsx:28
+msgid ""
+"Please verify your mail address \n"
+"or your account could get deleted after a few days."
+msgstr ""
+
+#: src/components/UserMessages.jsx:49
+msgid "A new verification mail is getting sent to you."
+msgstr ""
+
+#: src/components/UserMessages.jsx:53
+msgid "Click here to request a new verification mail."
+msgstr ""
+
+#: src/components/ChangeName.jsx:64
+msgid "New Username"
+msgstr ""
+
+#: src/components/LogInForm.jsx:76
+msgid "Name or Email"
+msgstr ""
+
+#: src/components/LogInForm.jsx:87
+msgid "LogIn"
+msgstr ""
+
 #: src/components/windows/Help.jsx:14
 #: src/components/windows/Settings.jsx:134
 msgctxt "keybinds"
diff --git a/src/socket/SocketServer.js b/src/socket/SocketServer.js
index d519e007..801509af 100644
--- a/src/socket/SocketServer.js
+++ b/src/socket/SocketServer.js
@@ -7,7 +7,7 @@ import logger from '../core/logger';
 // eslint-disable-next-line import/no-unresolved
 import canvases from './canvases.json';
 import Counter from '../utils/Counter';
-import { getIPFromRequest } from '../utils/ip';
+import { getIPFromRequest, getHostFromRequest } from '../utils/ip';
 
 import CoolDownPacket from './packets/CoolDownPacket';
 import PixelUpdate from './packets/PixelUpdateServer';
@@ -40,7 +40,13 @@ async function verifyClient(info, done) {
 
   // Limiting socket connections per ip
   const ip = getIPFromRequest(req);
-  logger.info(`Got ws request from ${ip} via ${headers.origin}`);
+  // CORS
+  const { origin } = headers;
+  if (!origin || !origin.endsWith(getHostFromRequest(req, false))) {
+    // eslint-disable-next-line max-len
+    logger.info(`Rejected CORS request on websocket from ${ip} via ${headers.origin}, expected ${getHostFromRequest(req, false)}`);
+    return done(false);
+  }
   if (ipCounter.get(ip) > 50) {
     logger.info(`Client ${ip} has more than 50 connections open.`);
     return done(false);
diff --git a/src/utils/ip.js b/src/utils/ip.js
index e7afe69e..5c44bcb0 100644
--- a/src/utils/ip.js
+++ b/src/utils/ip.js
@@ -1,6 +1,6 @@
 /**
  *
- * @flow
+ * basic functions to get data fromheaders and parse IPs
  */
 
 import logger from '../core/logger';
@@ -8,15 +8,20 @@ import logger from '../core/logger';
 import { USE_XREALIP } from '../core/config';
 
 
-export function getHostFromRequest(req): ?string {
+export function getHostFromRequest(req, includeProto = true) {
   const { headers } = req;
-  const host = headers['x-forwarded-host'] || headers.host;
-  const proto = headers['x-forwarded-proto'] || 'http';
+  const host = headers['x-forwarded-host']
+    || headers.host
+    || headers[':authority'];
+  if (!includeProto) {
+    return host;
+  }
 
+  const proto = headers['x-forwarded-proto'] || 'http';
   return `${proto}://${host}`;
 }
 
-export function getIPFromRequest(req): ?string {
+export function getIPFromRequest(req) {
   if (USE_XREALIP) {
     const ip = req.headers['x-real-ip'];
     if (ip) {
@@ -38,7 +43,7 @@ export function getIPFromRequest(req): ?string {
   return conip;
 }
 
-export function getIPv6Subnet(ip: string): string {
+export function getIPv6Subnet(ip) {
   if (ip.includes(':')) {
     // eslint-disable-next-line max-len
     const ipv6sub = `${ip.split(':').slice(0, 4).join(':')}:0000:0000:0000:0000`;