diff --git a/templates/manager/add.html b/templates/manager/add.html
index ee448fd..271d4c2 100644
--- a/templates/manager/add.html
+++ b/templates/manager/add.html
@@ -25,7 +25,7 @@
    <select required class="custom-select mr-sm-2" id="organization" name="organization">
      {% userOrgas as orgas %}
      {% for choice in orgas %}
-      <option value="{{ choice.id }}">{{ choice.name }}</option>
+      <option {% if user.userstatus.orga == choice %}selected{% endif %} value="{{ choice.id }}">{{ choice.name }}</option>
      {% endfor %}
    </select>
   </div>
diff --git a/templates/manager/addwifi.html b/templates/manager/addwifi.html
index c072c13..34c8870 100644
--- a/templates/manager/addwifi.html
+++ b/templates/manager/addwifi.html
@@ -21,7 +21,7 @@
    <select class="custom-select mr-sm-2" id="organization" name="organization">
      {% userOrgas as organizations %}
      {% for choice in organizations %}
-      <option value="{{ choice.id }}">{{ choice.name }}</option>
+      <option {% if user.userstatus.orga == choice %}selected{% endif %} value="{{ choice.id }}">{{ choice.name }}</option>
      {% endfor %}
    </select>
   </div>