diff --git a/app.py b/app.py
index 6890a3ad..b8a9f166 100644
--- a/app.py
+++ b/app.py
@@ -41,6 +41,7 @@
 app.secret_key = os.urandom(24)
 app.jinja_env.add_extension('jinja2.ext.i18n')
 app.config['BABEL_TRANSLATION_DIRECTORIES'] = 'translations'
+app.config['JSON_SORT_KEYS'] = False
 babel = Babel(app)
 site_name = "PiKaraoke"
 admin_password = None
@@ -459,10 +460,42 @@ def edit_file():
 
 @app.route("/splash")
 def splash():
+    # Only do this on Raspberry Pis
+    if is_raspberry_pi:
+        status = subprocess.run(['iwconfig', 'wlan0'], stdout=subprocess.PIPE).stdout.decode('utf-8')
+        text = ""
+        if "Mode:Master" in status:
+            # Wifi is setup as a Access Point
+            ap_name = ""
+            ap_password = ""
+            
+            if os.path.isfile("/etc/raspiwifi/raspiwifi.conf"):
+                f = open("/etc/raspiwifi/raspiwifi.conf", "r")
+            
+                # Override the default values according to the configuration file.
+                for line in f.readlines():
+                    line = line.split("#", 1)[0]
+                    if "ssid_prefix=" in line:
+                        ap_name = line.split("ssid_prefix=")[1].strip()
+                    elif "wpa_key=" in line:
+                        ap_password = line.split("wpa_key=")[1].strip()
+
+            if len(ap_password) > 0:
+                text = [f"Wifi Network: {ap_name} Password: {ap_password}", f"Configure Wifi: {k.url.rpartition(':')[0]}"]
+            else:
+                text = [f"Wifi Network: {ap_name}", f"Configure Wifi: {k.url.rpartition(':',1)[0]}"]
+        else:
+            # You are connected to Wifi as a client
+            text = ""
+    else:
+        # Not a Raspberry Pi
+        text = ""
+
     return render_template(
         "splash.html",
         blank_page=True,
         url=k.url,
+        hostap_info=text,
         hide_url=k.hide_url,
         hide_overlay=k.hide_overlay,
         screensaver_timeout=k.screensaver_timeout
diff --git a/static/screensaver.css b/static/screensaver.css
index 3823c5fb..56d5ce7f 100644
--- a/static/screensaver.css
+++ b/static/screensaver.css
@@ -18,8 +18,8 @@ body {
   position: absolute;
   left: 0px;
   top: 0px;
-  height: 180px;
-  width: 300px;
+  height: 200px;
+  width: 420px;
   z-index: 11;
   border-radius: 10px;
   display: flex;
diff --git a/templates/splash.html b/templates/splash.html
index 32734731..637cb5ba 100644
--- a/templates/splash.html
+++ b/templates/splash.html
@@ -301,6 +301,12 @@
   </div>
 </div>
 
+<div id="ap-container">
+  <div class="is-size-5 stroke">
+    <div id="hostap">{% for line in hostap_info %}{{ line }}<br />{% endfor %}</div>
+  </div>
+</div>
+
 <div id="bottom-container">
   {% if not hide_url %}
   <div id="qr-code">
@@ -387,7 +393,7 @@
       <div style="text-align: right">
         <img src="{{ url_for('qrcode') }}" width="30%" height="30%" />
       </div>
-      <div>{{ url }}</div>
+      <div>{{ hostap_info[0] }}<br />{{ url }}</div>
     </div>
     {% endif %}
   </div>
@@ -401,6 +407,7 @@
     background-color: black;
   }
   #top-container,
+  #ap-container,
   #bottom-container {
     position: absolute;
     z-index: 1;
@@ -411,6 +418,14 @@
     right: 0px;
     max-width: 75%;
   }
+  #ap-container {
+    top: 0px;
+    left: 0px;
+    max-width: 50%;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
+  }
   #bottom-container {
     bottom: 0px;
     left: 0px;