diff --git a/.gitignore b/.gitignore
index 905e9e0..11f26f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,3 +167,5 @@ deployment/secrets/*
 
 # Various local folders
 tmp/
+static.dist/
+media/
diff --git a/src/servala/core/models/organization.py b/src/servala/core/models/organization.py
index d59057b..be6737e 100644
--- a/src/servala/core/models/organization.py
+++ b/src/servala/core/models/organization.py
@@ -5,7 +5,7 @@ from django.db import models
 from django.utils.functional import cached_property
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
-from django_scopes import ScopedManager
+from django_scopes import ScopedManager, scopes_disabled
 
 from servala.core import rules as perms
 from servala.core.models.mixins import ServalaModelMixin
@@ -47,10 +47,11 @@ class Organization(ServalaModelMixin, models.Model):
         return self.urls.base
 
     def set_owner(self, user):
-        OrganizationMembership.objects.filter(user=user, organization=self).delete()
-        OrganizationMembership.objects.create(
-            user=user, organization=self, role=OrganizationRole.OWNER
-        )
+        with scopes_disabled():
+            OrganizationMembership.objects.filter(user=user, organization=self).delete()
+            OrganizationMembership.objects.create(
+                user=user, organization=self, role=OrganizationRole.OWNER
+            )
 
     @classmethod
     def create_organization(cls, instance, owner):
diff --git a/src/servala/settings.py b/src/servala/settings.py
index c4c2627..5d670ae 100644
--- a/src/servala/settings.py
+++ b/src/servala/settings.py
@@ -174,6 +174,8 @@ ACCOUNT_UNIQUE_EMAIL = True
 ACCOUNT_LOGIN_METHODS = {"email"}
 ACCOUNT_SIGNUP_FIELDS = ["email*", "password1*", "password2*"]
 ACCOUNT_SIGNUP_FORM_CLASS = "servala.frontend.forms.auth.ServalaSignupForm"
+if ALLOWED_HOSTS or not DEBUG:
+    ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https"
 
 AUTHENTICATION_BACKENDS = [
     "rules.permissions.ObjectPermissionBackend",