diff --git a/src/servala/frontend/context_processors.py b/src/servala/frontend/context_processors.py
new file mode 100644
index 0000000..1a180d8
--- /dev/null
+++ b/src/servala/frontend/context_processors.py
@@ -0,0 +1,5 @@
+def add_organizations(request):
+    if not request.user.is_authenticated:
+        return {"user_organizations": []}
+
+    return {"user_organizations": request.user.organizations.all()}
diff --git a/src/servala/frontend/templates/includes/sidebar.html b/src/servala/frontend/templates/includes/sidebar.html
index 2baecb5..617ff56 100644
--- a/src/servala/frontend/templates/includes/sidebar.html
+++ b/src/servala/frontend/templates/includes/sidebar.html
@@ -56,6 +56,36 @@
             </div>
             <div class="sidebar-menu">
                 <ul class="menu">
+                    {% if request.user.is_authenticated %}
+                        <li class="sidebar-item active">
+                            {% if user_organizations.count > 1 %}
+                                <button class="btn btn-primary dropdown-toggle me-1"
+                                        type="button"
+                                        id="organizationDropdown"
+                                        data-bs-toggle="dropdown"
+                                        aria-haspopup="true"
+                                        aria-expanded="false">
+                                    {% if current_organization %}
+                                        {{ current_organization.name }}
+                                    {% else %}
+                                        {% translate "Organizations" %}
+                                    {% endif %}
+                                </button>
+                                <div class="dropdown-menu" aria-labelledby="organizationDropdown">
+                                    {% for organization in user_organizations %}
+                                        <a class="dropdown-item" href="#TODO">{{ organization.name }}</a>
+                                    {% endfor %}
+                                </div>
+                            {% elif current_organization %}
+                                {% translate "Organization" %}: {{ current_organization.name }}
+                            {% else %}
+                                <a href="#TODO" class="sidebar-link">
+                                    <i class="bi bi-plus-square"></i>
+                                    <span>{% translate "Create organization" %}</span>
+                                </a>
+                            {% endif %}
+                        </li>
+                    {% endif %}
                     <li class="sidebar-item active">
                         <a href="index.html" class='sidebar-link'>
                             <i class="bi bi-grid-fill"></i>
diff --git a/src/servala/settings.py b/src/servala/settings.py
index 785169a..73c771b 100644
--- a/src/servala/settings.py
+++ b/src/servala/settings.py
@@ -144,6 +144,7 @@ TEMPLATES = [
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
                 "django.template.context_processors.static",
+                "servala.frontend.context_processors.add_organizations",
             ],
             "loaders": template_loaders,
         },
@@ -156,10 +157,9 @@ MESSAGE_TAGS = {
 
 AUTH_USER_MODEL = "core.User"
 ACCOUNT_USER_MODEL_USERNAME_FIELD = None
-ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_UNIQUE_EMAIL = True
-ACCOUNT_USERNAME_REQUIRED = False
-ACCOUNT_AUTHENTICATION_METHOD = "email"
+ACCOUNT_LOGIN_METHODS = {"email"}
+ACCOUNT_SIGNUP_FIELDS = ["email*", "password1*", "password2*"]
 
 AUTHENTICATION_BACKENDS = [
     # Needed to login by username in Django admin, regardless of `allauth`