diff --git a/app/itam/tests/device/test_device.py b/app/itam/tests/device/test_device.py
index f2306cb3..bfabca02 100644
--- a/app/itam/tests/device/test_device.py
+++ b/app/itam/tests/device/test_device.py
@@ -31,6 +31,12 @@ def test_device_not_global(user):
     pass
 
 
+@pytest.mark.skip(reason="to be written")
+def test_device_must_have_organization(user):
+    """ Devices must have organization set """
+    pass
+
+
 @pytest.mark.skip(reason="to be written")
 def test_device_operating_system_version_only_one(user):
     """model deviceoperatingsystem must only contain one value per device
diff --git a/app/itam/tests/operating_system/test_operating_system.py b/app/itam/tests/operating_system/test_operating_system.py
index ff51a895..de64efb3 100644
--- a/app/itam/tests/operating_system/test_operating_system.py
+++ b/app/itam/tests/operating_system/test_operating_system.py
@@ -12,6 +12,12 @@ import requests
 
 # class Test_app_structure_auth(unittest.TestCase):
 
+
+@pytest.mark.skip(reason="to be written")
+def test_operating_system_must_have_organization(user):
+    """ Operating_system must have organization set """
+    pass
+
 @pytest.mark.skip(reason="to be written")
 def test_operating_system_update_is_global_no_change(user):
     """Once operating_system is set to global it can't be changed.
diff --git a/app/itam/views/operating_system.py b/app/itam/views/operating_system.py
index db4d0358..9982a6b1 100644
--- a/app/itam/views/operating_system.py
+++ b/app/itam/views/operating_system.py
@@ -12,6 +12,7 @@ from itam.models.device import DeviceOperatingSystem
 from itam.models.operating_system import OperatingSystem, OperatingSystemVersion
 from itam.forms.operating_system.update import Update
 
+from settings.models.user_settings import UserSettings
 
 
 class IndexView(PermissionRequiredMixin, OrganizationPermission, generic.ListView):
@@ -104,6 +105,13 @@ class Add(PermissionRequiredMixin, OrganizationPermission, generic.CreateView):
     ]
 
 
+    def get_initial(self):
+
+        return {
+            'organization': UserSettings.objects.get(user = self.request.user).default_organization
+        }
+
+
     def get_success_url(self, **kwargs):
 
         return reverse('ITAM:Operating Systems')