diff --git a/epicyon-follow.css b/epicyon-follow.css
index 26a116c7a..2f7ec22f1 100644
--- a/epicyon-follow.css
+++ b/epicyon-follow.css
@@ -75,7 +75,7 @@ a:link {
 }
 
 .follow {
-    background-image: url("follow-background.png");
+    background-image: url("follow-background.jpg");
     background-size: cover;
     -webkit-background-size: cover;
     -moz-background-size: cover;
diff --git a/epicyon-login.css b/epicyon-login.css
index 034b5dc88..09b583a2f 100644
--- a/epicyon-login.css
+++ b/epicyon-login.css
@@ -33,7 +33,7 @@ body, html {
     background-color: var(--main-bg-color);
     color: var(--main-fg-color);
 
-    background-image: url("/login-background.png");
+    background-image: url("/login-background.jpg");
     background-size: cover;
     -webkit-background-size: cover;
     -moz-background-size: cover;
@@ -130,7 +130,12 @@ span.psw {
         background-color: var(--main-bg-color);
         color: var(--main-fg-color);
 
-        background-image: url("/login-background.png");
+        background-image: url("/login-background.jpg");
+	background-size: cover;
+	-webkit-background-size: cover;
+	-moz-background-size: cover;
+	background-repeat: no-repeat;
+	background-position: center;
         height: 100%;
         font-family: Arial, Helvetica, sans-serif;
         max-width: 60%;
@@ -173,7 +178,12 @@ span.psw {
         background-color: var(--main-bg-color);
         color: var(--main-fg-color);
 
-        background-image: url("/login-background.png");
+        background-image: url("/login-background.jpg");
+	background-size: cover;
+	-webkit-background-size: cover;
+	-moz-background-size: cover;
+	background-repeat: no-repeat;
+	background-position: center;
         height: 100%;
         font-family: Arial, Helvetica, sans-serif;
         max-width: 95%;
diff --git a/theme.py b/theme.py
index f62445315..8833e457d 100644
--- a/theme.py
+++ b/theme.py
@@ -112,7 +112,7 @@ def setThemeFromDict(baseDir: str, name: str, themeParams: {}) -> None:
 def setBackgroundFormat(baseDir: str, name: str, extension: str) -> None:
     """Sets the background file extension
     """
-    if extension == 'png':
+    if extension == 'jpg':
         return
     themeFiles = getThemeFiles()
     for filename in themeFiles:
diff --git a/webinterface.py b/webinterface.py
index b622c9760..4fb0925af 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1581,10 +1581,10 @@ def htmlLogin(translate: {}, baseDir: str, autocomplete=True) -> str:
         loginImageFilename = baseDir + '/accounts/' + loginImage
         copyfile(baseDir + '/img/login.png', loginImageFilename)
 
-    if os.path.isfile(baseDir + '/accounts/login-background-custom.png'):
-        if not os.path.isfile(baseDir + '/accounts/login-background.png'):
-            copyfile(baseDir + '/accounts/login-background-custom.png',
-                     baseDir + '/accounts/login-background.png')
+    if os.path.isfile(baseDir + '/accounts/login-background-custom.jpg'):
+        if not os.path.isfile(baseDir + '/accounts/login-background.jpg'):
+            copyfile(baseDir + '/accounts/login-background-custom.jpg',
+                     baseDir + '/accounts/login-background.jpg')
 
     if accounts > 0:
         loginText = \
@@ -1682,10 +1682,10 @@ def htmlTermsOfService(baseDir: str, httpPrefix: str, domainFull: str) -> str:
         copyfile(baseDir + '/default_tos.txt',
                  baseDir + '/accounts/tos.txt')
 
-    if os.path.isfile(baseDir + '/accounts/login-background-custom.png'):
-        if not os.path.isfile(baseDir + '/accounts/login-background.png'):
-            copyfile(baseDir + '/accounts/login-background-custom.png',
-                     baseDir + '/accounts/login-background.png')
+    if os.path.isfile(baseDir + '/accounts/login-background-custom.jpg'):
+        if not os.path.isfile(baseDir + '/accounts/login-background.jpg'):
+            copyfile(baseDir + '/accounts/login-background-custom.jpg',
+                     baseDir + '/accounts/login-background.jpg')
 
     TOSText = 'Terms of Service go here.'
     if os.path.isfile(baseDir + '/accounts/tos.txt'):
@@ -1723,10 +1723,10 @@ def htmlAbout(baseDir: str, httpPrefix: str,
         copyfile(baseDir + '/default_about.txt',
                  baseDir + '/accounts/about.txt')
 
-    if os.path.isfile(baseDir + '/accounts/login-background-custom.png'):
-        if not os.path.isfile(baseDir + '/accounts/login-background.png'):
-            copyfile(baseDir + '/accounts/login-background-custom.png',
-                     baseDir + '/accounts/login-background.png')
+    if os.path.isfile(baseDir + '/accounts/login-background-custom.jpg'):
+        if not os.path.isfile(baseDir + '/accounts/login-background.jpg'):
+            copyfile(baseDir + '/accounts/login-background-custom.jpg',
+                     baseDir + '/accounts/login-background.jpg')
 
     aboutText = 'Information about this instance goes here.'
     if os.path.isfile(baseDir + '/accounts/about.txt'):
@@ -5343,10 +5343,10 @@ def htmlFollowConfirm(translate: {}, baseDir: str,
     """
     followDomain, port = getDomainFromActor(followActor)
 
-    if os.path.isfile(baseDir + '/accounts/follow-background-custom.png'):
-        if not os.path.isfile(baseDir + '/accounts/follow-background.png'):
-            copyfile(baseDir + '/accounts/follow-background-custom.png',
-                     baseDir + '/accounts/follow-background.png')
+    if os.path.isfile(baseDir + '/accounts/follow-background-custom.jpg'):
+        if not os.path.isfile(baseDir + '/accounts/follow-background.jpg'):
+            copyfile(baseDir + '/accounts/follow-background-custom.jpg',
+                     baseDir + '/accounts/follow-background.jpg')
 
     cssFilename = baseDir + '/epicyon-follow.css'
     if os.path.isfile(baseDir + '/follow.css'):
@@ -5388,10 +5388,10 @@ def htmlUnfollowConfirm(translate: {}, baseDir: str,
     """
     followDomain, port = getDomainFromActor(followActor)
 
-    if os.path.isfile(baseDir + '/accounts/follow-background-custom.png'):
-        if not os.path.isfile(baseDir + '/accounts/follow-background.png'):
-            copyfile(baseDir + '/accounts/follow-background-custom.png',
-                     baseDir + '/accounts/follow-background.png')
+    if os.path.isfile(baseDir + '/accounts/follow-background-custom.jpg'):
+        if not os.path.isfile(baseDir + '/accounts/follow-background.jpg'):
+            copyfile(baseDir + '/accounts/follow-background-custom.jpg',
+                     baseDir + '/accounts/follow-background.jpg')
 
     cssFilename = baseDir + '/epicyon-follow.css'
     if os.path.isfile(baseDir + '/follow.css'):