diff --git a/src/auracaster_webui/app.py b/src/auracaster_webui/app.py
index 929788c..e1024b0 100644
--- a/src/auracaster_webui/app.py
+++ b/src/auracaster_webui/app.py
@@ -27,7 +27,7 @@ if "available_languages" not in st.session_state:
         st.session_state.available_languages = get_available_languages()
     except requests.exceptions.RequestException as e:
         st.error(f"Failed to load available languages: {str(e)}")
-        st.session_state.available_languages = ["German", "English"]  # Fallback languages
+        st.session_state.available_languages = ["deu", "eng"]  # Fallback languages using ISO codes
 
 # Initialize session state for announcement text and status tracking
 if "announcement_text" not in st.session_state:
@@ -86,6 +86,8 @@ def show_announcement_status():
                         st.write(f"📢 Announcement made to group {status_data['details']['group']['name']}:")
                         st.write(f"📡 Endpoints: {', '.join(status_data['details']['group']['endpoints'])}")
                         st.write(f"🗣️ '{status_data['details']['text']}'")
+                        
+                        # Display language codes directly
                         st.write(f"🌐 Languages: {', '.join(status_data['details']['languages'])}")
                 
                 # Clear the success message when announcement completes
@@ -255,7 +257,10 @@ with st.sidebar:
                 
                 # Add language selection for new group
                 available_languages = st.session_state.available_languages
-                new_group_languages = st.multiselect("Languages", options=available_languages)
+                new_group_languages = st.multiselect(
+                    "Languages", 
+                    options=available_languages
+                )
             except requests.exceptions.RequestException as e:
                 st.error(f"Failed to get available endpoints: {str(e)}")
                 new_group_endpoints = []