diff --git a/rdrf/rdrf/auth/password_validation.py b/rdrf/rdrf/auth/password_validation.py
index d3c896833..971c8a67f 100644
--- a/rdrf/rdrf/auth/password_validation.py
+++ b/rdrf/rdrf/auth/password_validation.py
@@ -91,9 +91,9 @@ def validation_error_text(min_occurrences):
 class ConsecutivelyRepeatingCharacterValidator:
     def __init__(self, length=3):
         self.length = length
-        assert (
-            self.length > 1
-        ), "Length should be at least 2 for consecutively repeating character validators!"
+        assert self.length > 1, (
+            "Length should be at least 2 for consecutively repeating character validators!"
+        )
         self.repeating_char = re.compile(
             r"""
             (.)   # any character, in a group so we can backreference
@@ -117,9 +117,9 @@ def get_help_text(self):
 class NumberRuleValidator(ABC):
     def __init__(self, length=3):
         self.length = length
-        assert (
-            self.length > 1
-        ), "Length should be at least 2 for numbers related password validators!"
+        assert self.length > 1, (
+            "Length should be at least 2 for numbers related password validators!"
+        )
 
     @staticmethod
     @abstractmethod
diff --git a/rdrf/rdrf/auth/pwned_passwords/pwned_passwords.py b/rdrf/rdrf/auth/pwned_passwords/pwned_passwords.py
index b027f5155..749374f5e 100644
--- a/rdrf/rdrf/auth/pwned_passwords/pwned_passwords.py
+++ b/rdrf/rdrf/auth/pwned_passwords/pwned_passwords.py
@@ -43,7 +43,7 @@ def range(self, hash_prefix):
             return response.content
 
     def _url(self, endpoint, *components):
-        return f'{self.base_url}/{endpoint}/{"/".join(components)}'
+        return f"{self.base_url}/{endpoint}/{'/'.join(components)}"
 
     def _request_headers(self):
         return {"Add-Padding": f"{str(self.add_padding).lower()}"}
diff --git a/rdrf/rdrf/auth/signed_url/util.py b/rdrf/rdrf/auth/signed_url/util.py
index eb0c763a3..56a828fad 100644
--- a/rdrf/rdrf/auth/signed_url/util.py
+++ b/rdrf/rdrf/auth/signed_url/util.py
@@ -21,9 +21,9 @@ def check_token(username_b64, token, max_token_age):
 
 def make_token(username):
     token_username, token = TimestampSigner().sign(username).split(":", 1)
-    assert (
-        username == token_username
-    ), "Something went wrong with token generation"
+    assert username == token_username, (
+        "Something went wrong with token generation"
+    )
     return token
 
 
diff --git a/rdrf/rdrf/exporter_utils.py b/rdrf/rdrf/exporter_utils.py
index 61d79cbdd..5970cdd55 100644
--- a/rdrf/rdrf/exporter_utils.py
+++ b/rdrf/rdrf/exporter_utils.py
@@ -103,9 +103,9 @@ def _export_cascading_form_definition(
     non_null_args = [
         arg for arg in [context_form_groups, forms, sections, cdes] if arg
     ]
-    assert (
-        len(non_null_args) == 1
-    ), f"Expected 1 form definition part to be provided, got {len(non_null_args)}"
+    assert len(non_null_args) == 1, (
+        f"Expected 1 form definition part to be provided, got {len(non_null_args)}"
+    )
 
     export_definition = {}
 
diff --git a/rdrf/rdrf/forms/dsl/code_evaluator.py b/rdrf/rdrf/forms/dsl/code_evaluator.py
index fa941c1a8..a6443b26f 100644
--- a/rdrf/rdrf/forms/dsl/code_evaluator.py
+++ b/rdrf/rdrf/forms/dsl/code_evaluator.py
@@ -151,7 +151,7 @@ def handle_instruction(self, inst):
         cde_validation = target.invalid_cdes()
         if cde_validation:
             logger.error(
-                f'Invalid CDEs specified: {" ".join([str(cde) for cde in cde_validation])}'
+                f"Invalid CDEs specified: {' '.join([str(cde) for cde in cde_validation])}"
             )
             return []
 
diff --git a/rdrf/rdrf/forms/dsl/validator.py b/rdrf/rdrf/forms/dsl/validator.py
index 138b33dc7..75dd204c7 100644
--- a/rdrf/rdrf/forms/dsl/validator.py
+++ b/rdrf/rdrf/forms/dsl/validator.py
@@ -395,7 +395,7 @@ def check_rules(self):
             errors.extend(self.handle_instruction(inst, idx + 1, checker))
 
         if errors:
-            logger.info(f'DSL validation errors: {", ".join(errors)}')
+            logger.info(f"DSL validation errors: {', '.join(errors)}")
             raise ValidationError(
                 {"conditional_rendering_rules": "\n".join(errors)}
             )
diff --git a/rdrf/rdrf/forms/navigation/quick_links.py b/rdrf/rdrf/forms/navigation/quick_links.py
index e06a2d3d6..7bbeb37a3 100644
--- a/rdrf/rdrf/forms/navigation/quick_links.py
+++ b/rdrf/rdrf/forms/navigation/quick_links.py
@@ -42,7 +42,7 @@ class LinkDefs:
         "admin:patients_patientstagerule_changelist", _("Patient Stages Rules")
     )
     PatientUser = QuickLink(
-        f'{reverse("admin:patients_patientuser_changelist")}?{urlencode({"linked": "N"})}',
+        f"{reverse('admin:patients_patientuser_changelist')}?{urlencode({'linked': 'N'})}",
         _("Patient Users"),
     )
     Reports = make_link("report:reports_list", _("Reports"))
diff --git a/rdrf/rdrf/forms/widgets/widgets.py b/rdrf/rdrf/forms/widgets/widgets.py
index b3f5aa919..3633ff3ff 100644
--- a/rdrf/rdrf/forms/widgets/widgets.py
+++ b/rdrf/rdrf/forms/widgets/widgets.py
@@ -648,25 +648,25 @@ def render(self, name, value, attrs=None, renderer=None):
             <div class="rdrf-cde-slider">
                 <div style="float:left; margin-right:20px;"><b>{_(left_label)}</b></div>
                 <div style="float:left">
-                    <input type="hidden" id="{attrs['id']}" name="{name}" value="{value}"/>
+                    <input type="hidden" id="{attrs["id"]}" name="{name}" value="{value}"/>
                 </div>
                 <div style="float:left;margin-left:20px;"><b>{_(right_label)}</b></div>
             </div>
             <br/>
             <script>
                 $(function() {{
-                    $( "#{attrs['id']}" ).bootstrapSlider({{
+                    $( "#{attrs["id"]}" ).bootstrapSlider({{
                         tooltip: 'always',
-                        id: '{attrs['id']}-slider',
+                        id: '{attrs["id"]}-slider',
                         value: '{value}',
                         {widget_attrs}
                     }});
 
                     // Set the uninitialised / null value to ""
-                    $( "#{attrs['id']}" ).val("{value}");
+                    $( "#{attrs["id"]}" ).val("{value}");
                     // Set the uninitialised / null value to "-" in the tooltip
                     if ("{value}" === "") {{
-                        $("#{attrs['id']}-slider .tooltip-inner").html("-");
+                        $("#{attrs["id"]}-slider .tooltip-inner").html("-");
                     }};
 
                      // Set z-index to 0 for slider tooltip so it's not displayed through
@@ -955,9 +955,9 @@ def __init__(self, *args, **kwargs):
     def extract_lookup_values(raw_value):
         if raw_value:
             values = raw_value.split(XnatWidget.SEPARATOR)
-            assert (
-                len(values) == 2
-            ), f"Invalid split result. Expected 2, got {len(values)}"
+            assert len(values) == 2, (
+                f"Invalid split result. Expected 2, got {len(values)}"
+            )
             return values
 
         return None, None
diff --git a/rdrf/rdrf/helpers/utils.py b/rdrf/rdrf/helpers/utils.py
index cc20fad09..f68215151 100644
--- a/rdrf/rdrf/helpers/utils.py
+++ b/rdrf/rdrf/helpers/utils.py
@@ -383,7 +383,7 @@ def display(form_or_formset, field, error):
         ).replace("Set", "")
         qualifier = de_camelcase(form_name)
         if field:
-            qualifier += f' {field.replace("_", " ")}'
+            qualifier += f" {field.replace('_', ' ')}"
         return f"{qualifier}: {error}"
 
     for form in forms:
diff --git a/rdrf/rdrf/services/io/defs/importer.py b/rdrf/rdrf/services/io/defs/importer.py
index 37e67ba0d..3223353d3 100644
--- a/rdrf/rdrf/services/io/defs/importer.py
+++ b/rdrf/rdrf/services/io/defs/importer.py
@@ -474,7 +474,7 @@ def _create_cdes(self, cde_maps):
                     ]
                     if import_value not in valid_types:
                         raise ValidationError(
-                            f'Invalid data type {import_value} for CDE: {cde_map["code"]}'
+                            f"Invalid data type {import_value} for CDE: {cde_map['code']}"
                         )
                 elif field == "widget_name":
                     import_value = CdeMappings.fix_widget_name(
@@ -486,7 +486,7 @@ def _create_cdes(self, cde_maps):
                     valid_widgets = get_widgets_for_data_type(data_type) + [""]
                     if import_value not in valid_widgets:
                         raise ValidationError(
-                            f'Invalid widget_name {cde_map[field]} for datatype {data_type} and CDE: {cde_map["code"]}'
+                            f"Invalid widget_name {cde_map[field]} for datatype {data_type} and CDE: {cde_map['code']}"
                         )
 
                 if not created:
diff --git a/rdrf/rdrf/templates/two_factor/core/login.html b/rdrf/rdrf/templates/two_factor/core/login.html
index 235bcc8c6..94cfb33f8 100644
--- a/rdrf/rdrf/templates/two_factor/core/login.html
+++ b/rdrf/rdrf/templates/two_factor/core/login.html
@@ -81,7 +81,7 @@
             </div>
             <div class="mb-3">
               <label for="id_auth-password">{{ form.password.label }}:</label>
-              <input type="password" name="auth-password" class="form-control" value="{{ form.password.value|default:"" }}" required="required" id="id_auth-password">
+              <input type="password" name="auth-password" class="form-control" required="required" id="id_auth-password">
             </div>
               <div class="mb-3 form-check">
                   <input type="checkbox" id="id_toggle-password" class="form-check-input">
diff --git a/rdrf/rdrf/testing/behaviour/features/auth/page.py b/rdrf/rdrf/testing/behaviour/features/auth/page.py
index 745896a99..806f57975 100644
--- a/rdrf/rdrf/testing/behaviour/features/auth/page.py
+++ b/rdrf/rdrf/testing/behaviour/features/auth/page.py
@@ -214,7 +214,7 @@ def submit(self):
 
 def get_site_links(site_url, registry_code):
     def _make_url(resource):
-        return f'{"/".join([site_url, resource])}'
+        return f"{'/'.join([site_url, resource])}"
 
     return {
         key: _make_url(resource)
diff --git a/rdrf/rdrf/testing/unit/quicklinks_tests.py b/rdrf/rdrf/testing/unit/quicklinks_tests.py
index 0144a4657..5edeba2cd 100644
--- a/rdrf/rdrf/testing/unit/quicklinks_tests.py
+++ b/rdrf/rdrf/testing/unit/quicklinks_tests.py
@@ -19,9 +19,9 @@ def assertContainsAll(self, values_dict, container):
 
     def assertContainsNoneOf(self, values_dict, container):
         for value in values_dict.values():
-            assert (
-                value not in container
-            ), f"{value} found unexpectedly in {container}"
+            assert value not in container, (
+                f"{value} found unexpectedly in {container}"
+            )
 
 
 class NormalQuickLinksTests(ExtraAssertionsMixin, RDRFTestCase):
diff --git a/rdrf/rdrf/testing/unit/tests.py b/rdrf/rdrf/testing/unit/tests.py
index 0fdb78f15..282e8f4d7 100644
--- a/rdrf/rdrf/testing/unit/tests.py
+++ b/rdrf/rdrf/testing/unit/tests.py
@@ -275,23 +275,23 @@ def check_cde_in_section(cde_code, section_dict):
                     if cde_dict_item["code"] == cde_code:
                         return True
 
-        assert not check_cde_in_section(
-            "CDE00016", s_section
-        ), "CDE00016 is still in source section"
-        assert check_cde_in_section(
-            "CDE00016", t_section
-        ), "CDE00016 is not in target section found"
+        assert not check_cde_in_section("CDE00016", s_section), (
+            "CDE00016 is still in source section"
+        )
+        assert check_cde_in_section("CDE00016", t_section), (
+            "CDE00016 is not in target section found"
+        )
 
-        assert not check_cde_in_section(
-            "FHCRP", s_section
-        ), "FHCRP is still in source section"
-        assert check_cde_in_section(
-            "FHCRP", t_section
-        ), "FHCRP is not in target section found"
+        assert not check_cde_in_section("FHCRP", s_section), (
+            "FHCRP is still in source section"
+        )
+        assert check_cde_in_section("FHCRP", t_section), (
+            "FHCRP is not in target section found"
+        )
 
-        assert check_cde_in_section(
-            "FHCompliance", s_section
-        ), "FHCompliance has been moved."
+        assert check_cde_in_section("FHCompliance", s_section), (
+            "FHCompliance has been moved."
+        )
 
 
 def mock_messages():
@@ -388,9 +388,9 @@ def test_user_in_wrong_group_cant_view_form(self):
 def export_yaml_file_test(registry):
     exporter = Exporter(registry)
     yaml_data, errors = exporter.export_yaml()
-    assert isinstance(
-        errors, list
-    ), "Expected errors list in exporter export_yaml"
+    assert isinstance(errors, list), (
+        "Expected errors list in exporter export_yaml"
+    )
     assert len(errors) == 0, "Expected zero errors instead got:%s" % errors
     assert isinstance(yaml_data, str), (
         "Expected yaml_data is  string:%s" % type(yaml_data)
@@ -808,22 +808,22 @@ def form_value(form_name, section_code, cde_code, mongo_record):
         the_form = mongo_record["forms"][0]
         assert isinstance(the_form, dict), "form data should be a dictionary"
         assert "sections" in the_form, "A form should have a sections key"
-        assert isinstance(
-            the_form["sections"], list
-        ), "Sections should be in a list"
+        assert isinstance(the_form["sections"], list), (
+            "Sections should be in a list"
+        )
         # we've only written data for 2 sections
         assert len(the_form["sections"]) == 2, (
             "expected 2 sections got %s" % len(the_form["sections"])
         )
 
         for section_dict in the_form["sections"]:
-            assert isinstance(
-                section_dict, dict
-            ), "sections should be dictioanaries"
+            assert isinstance(section_dict, dict), (
+                "sections should be dictioanaries"
+            )
             assert "cdes" in section_dict, "sections should have a cdes key"
-            assert isinstance(
-                section_dict["cdes"], list
-            ), "sections cdes key should be a list"
+            assert isinstance(section_dict["cdes"], list), (
+                "sections cdes key should be a list"
+            )
             for cde in section_dict["cdes"]:
                 assert isinstance(cde, dict), "cde should be a dict"
                 assert "code" in cde, "cde dictionary should have a code key"
@@ -1527,9 +1527,9 @@ def test_cdes(self):
         m = self.make_modjgo("cdes", good)
         output = self._run_command(registry_code="foobar", collection="cdes")
         print("output = [%s]" % output)
-        assert (
-            output == ""
-        ), "check_structure test of good data should output nothing"
+        assert output == "", (
+            "check_structure test of good data should output nothing"
+        )
 
     def test_history(self):
         foobar = Registry()
@@ -1712,9 +1712,9 @@ class Time:
 
         lines = result.split("\n")
 
-        assert (
-            "dummy send reg_code=foobar description=reminder" in lines[0]
-        ), "send-reminders failed?"
+        assert "dummy send reg_code=foobar description=reminder" in lines[0], (
+            "send-reminders failed?"
+        )
 
         # create some dummy email notification history models to simulate previous
         # reminders being sent
@@ -1731,9 +1731,9 @@ class Time:
 
         lines = result.split("\n")
 
-        assert (
-            "not sent" in lines
-        ), "Expected reminder NOT to be sent if one already sent"
+        assert "not sent" in lines, (
+            "Expected reminder NOT to be sent if one already sent"
+        )
 
         # 2nd one allowed
         self._clear_notifications()
@@ -1750,9 +1750,9 @@ class Time:
 
         lines = result.split("\n")
         print(lines)
-        assert (
-            "dummy send reg_code=foobar description=reminder" in lines[0]
-        ), "send-reminders failed?"
+        assert "dummy send reg_code=foobar description=reminder" in lines[0], (
+            "send-reminders failed?"
+        )
 
         self._clear_notifications()
         self._setup_user("testuser", Time.LONG_AGO)
@@ -1768,9 +1768,9 @@ class Time:
 
         lines = result.split("\n")
         print(lines)
-        assert (
-            "not sent" in lines
-        ), "Expected reminder NOT to be sent if two or more already sent"
+        assert "not sent" in lines, (
+            "Expected reminder NOT to be sent if two or more already sent"
+        )
 
 
 class ClinicalDataTestCase(RDRFTestCase):
diff --git a/rdrf/rdrf/users/views.py b/rdrf/rdrf/users/views.py
index 61ee1304e..e42ddd7af 100644
--- a/rdrf/rdrf/users/views.py
+++ b/rdrf/rdrf/users/views.py
@@ -90,7 +90,7 @@ def post(self, request, *args, **kwargs):
             messages.add_message(
                 request,
                 messages.SUCCESS,
-                f'{_("An Email address change request has been created for user: %s") % self.user.get_full_name()}',
+                f"{_('An Email address change request has been created for user: %s') % self.user.get_full_name()}",
             )
 
             return self._redirect_response()
@@ -98,7 +98,7 @@ def post(self, request, *args, **kwargs):
             form.add_error(
                 NON_FIELD_ERRORS,
                 ValidationError(
-                    f'{_("Email address change request has failed for user")}: {self.user.get_full_name()}'
+                    f"{_('Email address change request has failed for user')}: {self.user.get_full_name()}"
                 ),
             )
 
diff --git a/rdrf/rdrf/views/context_views.py b/rdrf/rdrf/views/context_views.py
index c5fdadb91..1f0423288 100644
--- a/rdrf/rdrf/views/context_views.py
+++ b/rdrf/rdrf/views/context_views.py
@@ -94,9 +94,9 @@ def allowed(self, user, registry_code, patient_id, context_id=None):
     def create_context_and_goto_form(
         self, registry_model, patient_model, context_form_group
     ):
-        assert (
-            len(context_form_group.forms) == 1
-        ), "Direct link only possible if num forms in form group is 1"
+        assert len(context_form_group.forms) == 1, (
+            "Direct link only possible if num forms in form group is 1"
+        )
         patient_content_type = ContentType.objects.get_for_model(patient_model)
         form_model = context_form_group.forms[0]
         context_model = RDRFContext()
diff --git a/rdrf/rdrf/views/registration_rdrf.py b/rdrf/rdrf/views/registration_rdrf.py
index 4429a55d5..9f39a359c 100644
--- a/rdrf/rdrf/views/registration_rdrf.py
+++ b/rdrf/rdrf/views/registration_rdrf.py
@@ -182,7 +182,7 @@ def get_success_url(self, user):
             login(
                 self.request, user, "django.contrib.auth.backends.ModelBackend"
             )
-        return f'{reverse("two_factor:login")}?next={reverse("login_router")}?new_activation=True'
+        return f"{reverse('two_factor:login')}?next={reverse('login_router')}?new_activation=True"
 
 
 def validate_recaptcha(response_value):
diff --git a/rdrf/registry/groups/admin_forms.py b/rdrf/registry/groups/admin_forms.py
index 1a02a29be..5b4dbdff3 100644
--- a/rdrf/registry/groups/admin_forms.py
+++ b/rdrf/registry/groups/admin_forms.py
@@ -163,7 +163,7 @@ def __init__(self, *args, **kwargs):
             "user_email_change", kwargs={"user_id": self.instance.id}
         )
         sync_email_help_text = (
-            f'{_("Synchronised email address changes can be made using")}: '
+            f"{_('Synchronised email address changes can be made using')}: "
             f'<a href="{change_email_url}">{_("Change email address form")}</a>.'
         )
         self.fields["username"].help_text += mark_safe(
diff --git a/rdrf/registry/patients/admin.py b/rdrf/registry/patients/admin.py
index d4479ffc9..8a302b4af 100644
--- a/rdrf/registry/patients/admin.py
+++ b/rdrf/registry/patients/admin.py
@@ -652,7 +652,7 @@ def patient(self, patient_model):
         if patient_model.guid:
             patient_attrs.append(f"GUID: {patient_model.guid}")
 
-        return f'{patient_model.display_name} ({", ".join(patient_attrs)})'
+        return f"{patient_model.display_name} ({', '.join(patient_attrs)})"
 
     def get_list_display(self, request):
         supports_guid = any(
diff --git a/rdrf/registry/patients/admin_forms.py b/rdrf/registry/patients/admin_forms.py
index 5884563f8..01b31e36b 100644
--- a/rdrf/registry/patients/admin_forms.py
+++ b/rdrf/registry/patients/admin_forms.py
@@ -1111,7 +1111,7 @@ def clean_user(self):
                         " "
                         + _("User's missing registries")
                         + ": "
-                        + f'{", ".join(r.name for r in missing_registries)}.'
+                        + f"{', '.join(r.name for r in missing_registries)}."
                     )
 
                 if extra_registries:
@@ -1119,7 +1119,7 @@ def clean_user(self):
                         " "
                         + _("User's extra registries")
                         + ": "
-                        + f'{", ".join(r.name for r in extra_registries)}.'
+                        + f"{', '.join(r.name for r in extra_registries)}."
                     )
 
                 raise ValidationError(registry_diff_error)
diff --git a/rdrf/registry/patients/models.py b/rdrf/registry/patients/models.py
index 5ffbedad5..2d10b6d3d 100644
--- a/rdrf/registry/patients/models.py
+++ b/rdrf/registry/patients/models.py
@@ -602,7 +602,7 @@ def calculate_age(born):
 
     @property
     def display_age(self):
-        return f'{self.age} {_("years")}'
+        return f"{self.age} {_('years')}"
 
     @property
     def guid(self):
@@ -1368,9 +1368,9 @@ def get_forms_by_group(self, context_form_group, user=None):
         to existing forms "of type" (ie being in a context with a link to)  context_form_group
 
         """
-        assert (
-            context_form_group.supports_direct_linking
-        ), "Context Form group must only contain one form"
+        assert context_form_group.supports_direct_linking, (
+            "Context Form group must only contain one form"
+        )
         form_model = context_form_group.forms[0]
         if user and not user.can_view(form_model):
             return []
diff --git a/rdrf/report/schema.py b/rdrf/report/schema.py
index 186360554..e953aed31 100644
--- a/rdrf/report/schema.py
+++ b/rdrf/report/schema.py
@@ -425,9 +425,9 @@ def resolve_last_updated(parent, _info):
 def get_schema_field_name(s):
     if not _graphql_field_pattern.match(s):
         new_str = f"field{s}"
-        assert _graphql_field_pattern.match(
-            new_str
-        ), f"Cannot use field '{s}' in graphql schema"
+        assert _graphql_field_pattern.match(new_str), (
+            f"Cannot use field '{s}' in graphql schema"
+        )
         return new_str
     return s
 
@@ -496,9 +496,9 @@ def get_cfg_forms(cfg_key, cfg_model):
 
             def form_resolver(parent, _info, form_model):
                 _patient, _contexts, clinical_data = parent
-                assert (
-                    len(clinical_data) <= 1
-                ), "Too many clinical data records to resolve form"
+                assert len(clinical_data) <= 1, (
+                    "Too many clinical data records to resolve form"
+                )
 
                 if len(clinical_data) == 0:
                     return None