diff --git a/frontend/components/learning_circle_form/FinalizeSection.jsx b/frontend/components/learning_circle_form/FinalizeSection.jsx
index 84f08cf6..8cbe9038 100644
--- a/frontend/components/learning_circle_form/FinalizeSection.jsx
+++ b/frontend/components/learning_circle_form/FinalizeSection.jsx
@@ -2,10 +2,11 @@ import React, { useState } from 'react'
 import { TextareaWithLabel, SelectWithLabel, InputWithLabel, SwitchWithLabels } from 'p2pu-components'
 
 const SignupLimit = (props) => {
-
-  let maxSignups = null;
-  let defaultLimit = 20;
-  if (window.maxSignups){
+  // maxSignups indicates if there is a hard limit set, iow 
+  // you can toggle unlimited signups if it isn't null
+  let maxSignups = null
+  let defaultLimit = 20
+  if (window.maxSignups !== undefined){
     maxSignups = window.maxSignups
     defaultLimit = maxSignups
   }
@@ -20,7 +21,7 @@ const SignupLimit = (props) => {
 
   return (
     <>
-      { !maxSignups && 
+      { (maxSignups === null) && 
         <SwitchWithLabels
           label={'Do you want to limit the number of signups?'}
           trueLabel='Yes'
@@ -30,7 +31,7 @@ const SignupLimit = (props) => {
           value={props.learningCircle.signup_limit !== undefined}
         />
       }
-      { (props.learningCircle.signup_limit !== undefined || maxSignups) &&
+      { (props.learningCircle.signup_limit !== undefined || maxSignups !== null) &&
         <InputWithLabel
           label={'What is the maximum number of signups?'}
           type='number'
diff --git a/media/db.py b/media/db.py
index 9ae17327..1acd397e 100644
--- a/media/db.py
+++ b/media/db.py
@@ -7,4 +7,4 @@ class Image(models.Model):
     uploader_uri = models.CharField(max_length=256)
 
     def __str__(self):
-        return self.image_file
+        return str(self.image_file)
diff --git a/studygroups/signals.py b/studygroups/signals.py
index 050b9523..07899fa2 100644
--- a/studygroups/signals.py
+++ b/studygroups/signals.py
@@ -12,6 +12,8 @@
 from .models import StudyGroup
 from .models import Course
 from .models import get_study_group_organizers
+from .models import TeamMembership
+from .models import DeviceAllocation
 
 from .utils import html_body_to_text
 from .utils import use_language
@@ -19,6 +21,7 @@
 from advice.models import Advice
 
 import pytz
+import datetime
 
 @receiver(post_save, sender=Application)
 def handle_new_application(sender, instance, created, **kwargs):
@@ -107,3 +110,18 @@ def handle_new_study_group_creation(sender, instance, created, **kwargs):
     )
     notification.attach_alternative(html_body, 'text/html')
     notification.send()
+
+
+@receiver(post_save, sender=TeamMembership)
+def handle_new_team_membership(sender, instance, created, **kwargs):
+    if not created:
+        return
+
+    team_membership = instance
+    if team_membership.team.page_slug == 'digital-detroit':
+        DeviceAllocation.objects.create(
+            user=team_membership.user,
+            start_date=datetime.date(2026,2,1),
+            cutoff_date=datetime.date(2026,7,1),
+            amount=10,
+        )
diff --git a/studygroups/tests/test_device_allocation.py b/studygroups/tests/test_device_allocation.py
index 08f23ddf..43e102a5 100644
--- a/studygroups/tests/test_device_allocation.py
+++ b/studygroups/tests/test_device_allocation.py
@@ -45,6 +45,8 @@ def setUp(self):
 
 
     def test_create_study_group_with_limit(self):
+        self.assertEquals(1, DeviceAllocation.objects.count())
+        DeviceAllocation.objects.all().delete()
         c = Client()
         c.login(username='bob@example.net', password='password')
         data = {
@@ -119,6 +121,9 @@ def test_create_study_group_with_limit(self):
 
 
     def test_update_learning_circle(self):
+        self.assertEquals(1, DeviceAllocation.objects.count())
+        DeviceAllocation.objects.all().delete()
+
         self.facilitator.profile.email_confirmed_at = timezone.now()
         self.facilitator.profile.save()
 
diff --git a/templates/studygroups/studygroup_form.html b/templates/studygroups/studygroup_form.html
index 1b630a21..a1a27185 100644
--- a/templates/studygroups/studygroup_form.html
+++ b/templates/studygroups/studygroup_form.html
@@ -29,7 +29,7 @@
   window.team = team;
   window.currentUserId = {% if user.id %}{{user.id|safe}}{% else %}undefined{% endif %};
   window.teamCourseList = {% if team_course_list %}true{% else %}false{% endif %};
-  {% if max_signups %}window.maxSignups = {{max_signups}};{% endif %}
+  {% if max_signups is None %}{% else %}window.maxSignups = {{max_signups}};{% endif %}
 </script>
 {% if object.pk %}
 <script>