diff --git a/.credo.exs b/.credo.exs
index d7efb3f..d871572 100644
--- a/.credo.exs
+++ b/.credo.exs
@@ -89,7 +89,7 @@
           # If you don't want TODO comments to cause `mix credo` to fail, just
           # set this value to 0 (zero).
           #
-          {Credo.Check.Design.TagTODO, [exit_status: 2]},
+          {Credo.Check.Design.TagTODO, [exit_status: 0]},
 
           #
           ## Readability Checks
diff --git a/.drone.yml b/.drone.yml
index 3195217..20d3ed7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: check
 
 services:
   - name: postgres
-    image: docker.io/library/postgres:17.5
+    image: docker.io/library/postgres:17.6
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -55,7 +55,7 @@ steps:
       - mix credo
 
   - name: wait_for_postgres
-    image: docker.io/library/postgres:17.5
+    image: docker.io/library/postgres:17.6
     commands:
       # Wait for postgres to become available
       - |
@@ -117,7 +117,7 @@ environment:
 
 steps:
   - name: renovate
-    image: renovate/renovate:41.72
+    image: renovate/renovate:41.151
     environment:
       RENOVATE_CONFIG_FILE: "renovate_backend_config.js"
       RENOVATE_TOKEN:
diff --git a/.tool-versions b/.tool-versions
index ceb5450..60315fc 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 elixir 1.18.3-otp-27
 erlang 27.3.4
-just 1.42.4
+just 1.43.0
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f36a7b7
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+
+    Copyright (C) {{ year }}  {{ organization }}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/README.md b/README.md
index 38013f4..60bb115 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,208 @@
-# mitgliederverwaltung
+# Mila
 
-## Testing SSO with rauthy
+**Mila** — simple, usable, self-hostable membership management for small to mid-sized clubs.  
+
+[![Build Status](https://drone.dev.local-it.cloud/api/badges/local-it/mitgliederverwaltung/status.svg)](https://drone.dev.local-it.cloud/local-it/mitgliederverwaltung)
+![License](https://img.shields.io/badge/license-AGPL--v3-blue)  
+
+## 🚧 Project Status
+
+⚠️ **Early development** — not production-ready. Expect breaking changes.  
+Contributions and feedback are welcome!
+
+## ✨ Overview
+
+Mila is a free and open-source membership management tool designed for real club needs.  
+It is **self-hosting friendly**, aims for **accessibility and GDPR compliance**, and focuses on **usability** instead of feature overload.  
+
+## 💡 Why Mila?
+
+Most membership tools for clubs are either:
+
+* **Too complex** — overloaded with features small and mid-sized clubs don’t need
+* **Too expensive** — hidden fees, closed ecosystems, vendor lock-in
+* **Too rigid** — no way to adapt fields, processes, or roles to your club’s reality
+
+**Mila** is different:
+
+* **Simple**: Focused on what clubs really need — members, dues, communication.
+* **Usable**: Clean, accessible UI, GDPR-compliant, designed with everyday volunteers in mind.
+* **Flexible**: Customize what data you collect about members, role-based permissions, and self-service for members.
+* **Truly open**: 100% free and open source — no lock-in, transparent code, self-host friendly.
+
+Our philosophy: **software should help people spend less time on administration and more time on their community.**
+
+## 📸 Screenshots
+
+![Screenshot placeholder](docs/images/screenshot.png)  
+*This is how Mila might look in action.*  
+
+## 🔑 Features
+
+- ✅ Manage member data with ease  
+- 🚧 Overview of membership fees & payment status  
+- ✅ Full-text search  
+- 🚧 Sorting & filtering  
+- 🚧 Roles & permissions (e.g. board, treasurer)  
+- ✅ Custom fields (flexible per club needs)  
+- ✅ SSO via OIDC (tested with Rauthy)  
+- 🚧 Self-service & online application  
+- 🚧 Accessibility, GDPR, usability improvements  
+- 🚧 Email sending  
+
+## 🚀 Quick Start (Development)
+
+### Prerequisites
+
+We recommend using **[asdf](https://asdf-vm.com/)** for managing tool versions.  
+- Tested with: `asdf 0.16.5`
+- Required versions are documented in `.tool-versions` in this repo  
+
+<details>
+<summary>Install system dependencies (Debian/Ubuntu)</summary>
+
+```bash
+# Debian 12
+apt-get -y install build-essential autoconf m4 libncurses-dev libwxgtk3.2-dev libwxgtk-webview3.2-dev libgl1-mesa-dev libglu1-mesa-dev libpng-dev libssh-dev unixodbc-dev xsltproc fop libxml2-utils openjdk-17-jdk icu-devtools bison flex pkg-config
+
+# Ubuntu 24
+apt-get -y install build-essential autoconf m4 libwxgtk3.2-dev libwxgtk-webview3.2-dev libgl1-mesa-dev libglu1-mesa-dev libpng-dev libssh-dev unixodbc-dev xsltproc fop libxml2-utils libncurses-dev openjdk-11-jdk icu-devtools bison flex libreadline-dev
+```
+</details>
+
+<details>
+<summary>Install asdf</summary>
+
+```bash
+mkdir ~/.asdf
+cd ~/.asdf
+wget https://github.com/asdf-vm/asdf/releases/download/v0.16.5/asdf-v0.16.5-linux-amd64.tar.gz
+tar -xvf asdf-v0.16.5-linux-amd64.tar.gz
+ln -s ~/.asdf/asdf ~/.local/bin/asdf
+```
+
+Then follow the official “Shell Configuration” steps in the asdf docs.  
+
+*Fish example* (`~/.config/fish/config.fish`):  
+
+```fish
+asdf completion fish > ~/.config/fish/completions/asdf.fish
+set -gx PATH "$HOME/.asdf/shims" $PATH
+```
+
+*Bash example* (`~/.bash_profile` and `~/.bashrc`):  
+
+```bash
+export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
+. <(asdf completion bash)
+```
+</details>
+
+### Install project dependencies
+
+```bash
+git clone https://git.local-it.org/local-it/mitgliederverwaltung.git mila
+cd mila
+asdf install
+
+# Inside the repo folder:
+mix local.hex 
+mix archive.install hex phx_new 
+```
+
+> Note: running `mix local.hex` must be done inside the repo folder,  
+> because `.tool-versions` defines the Erlang/Elixir versions.
+
+### Run the app
+
+1. Copy env file:  
+   ```bash
+   cp .env.example .env
+   # Set OIDC_CLIENT_SECRET inside .env
+   ```
+
+2. Start everything (database, Mailcrab, Rauthy, app):  
+   ```bash
+   just run
+   ```
+
+3. Services will be available at:  
+   - App: <http://localhost:4000>  
+   - Mail UI: <http://localhost:1080>  
+   - Postgres: `localhost:5000`  
+
+## 🔐 Testing SSO locally
+
+Mila uses OIDC for Single Sign-On. In development, a local **Rauthy** instance is provided.  
 
 1. `just run`
-1. go to [localhost:8080](http://localhost:8080), go to the Admin area
-1. Login with "admin@localhost" and password from `BOOTSTRAP_ADMIN_PASSWORD_PLAIN` in docker-compose.yml
-1. add client from the admin panel
+2. go to [localhost:8080](http://localhost:8080), go to the Admin area
+3. Login with "admin@localhost" and password from `BOOTSTRAP_ADMIN_PASSWORD_PLAIN` in docker-compose.yml
+4. add client from the admin panel
     - Client ID: mv
     - redirect uris: http://localhost:4000/auth/user/rauthy/callback
     - Authorization Flows: authorization_code
     - allowed origins: http://localhost:4000
     - access/id token algortihm: RS256 (EDDSA did not work for me, found just few infos in the ashauthentication docs)
-1. copy client secret to `.env` file
-1. abort and run `just run` again
+5. copy client secret to `.env` file
+6. abort and run `just run` again
 
+Now you can log in to Mila via OIDC!  
 
+## ⚙️ Configuration
 
+- **Env vars:** see `.env.example`  
+  - `OIDC_CLIENT_SECRET` — secret for your OIDC client  
+- Database defaults (Docker Compose):  
+  - Host: `localhost`  
+  - Port: `5000`  
+  - User/pass: `postgres` / `postgres`  
+  - DB: `mila_dev`  
+
+## 🏗️ Architecture
+
+- **Backend:** Elixir, Phoenix, LiveView, Ash Framework  
+- **Frontend:** Phoenix LiveView + DaisyUI + Heroicons  
+- **Database:** PostgreSQL (via AshPostgres)  
+- **Auth:** AshAuthentication (OIDC + password strategy)  
+- **Mail:** Swoosh  
+- **i18n:** Gettext  
+
+Code structure:  
+- `lib/mv/` — core Ash resources/domains (`Accounts`, `Membership`)  
+- `lib/mv_web/` — Phoenix controllers, LiveViews, components  
+- `assets/` — frontend assets (Tailwind, JS, etc.)  
+
+## 🧑‍💻 Development
+
+Useful `just` commands:  
+- `just run` — start DB, Mailcrab, Rauthy, app  
+- `just test` — run tests  
+- `just lint` — run code style checks (credo, formatter)  
+- `just audit` — run security audits  
+- `just reset-database` — reset local DB  
+- `just regen-migrations <name>` — regenerate migrations  
+
+## 📦 Deployment
+
+A production release image is built via the provided `Dockerfile`.  
+Entrypoint: `/app/bin/server`.  
+
+More detailed deployment docs are planned.  
+
+## 🤝 Contributing
+
+We welcome contributions!  
+- Open issues and PRs in this repo.  
+- Please follow existing code style and conventions.  
+- Expect breaking changes while the project is in early development.  
+
+## 📄 License
+
+**License: AGPLv3**  
+See the [LICENSE](LICENSE) file for details.  
+
+## 📬 Contact
+
+- Issues: [GitLab Issues](https://git.local-it.org/local-it/mitgliederverwaltung/-/issues)  
+- Community links: coming soon.  
diff --git a/docker-compose.yml b/docker-compose.yml
index 0071ba6..297b4af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 
 services:
   db:
-    image: postgres:17.5-alpine
+    image: postgres:17.6-alpine
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
diff --git a/lib/accounts/user.ex b/lib/accounts/user.ex
index b085407..668ddd4 100644
--- a/lib/accounts/user.ex
+++ b/lib/accounts/user.ex
@@ -12,6 +12,12 @@ defmodule Mv.Accounts.User do
   postgres do
     table "users"
     repo Mv.Repo
+
+    references do
+      # When a member is deleted, set the user's member_id to NULL
+      # This allows users to continue existing even if their linked member is removed
+      reference :member, on_delete: :nilify
+    end
   end
 
   @doc """
@@ -60,15 +66,77 @@ defmodule Mv.Accounts.User do
   end
 
   actions do
-    defaults [:read, :create, :destroy, :update]
+    # Default actions kept for framework/tooling integration:
+    # - :create -> Used by AshAdmin's generated "Create" UI and by generic
+    #              AshPhoenix helpers that assume a default create action.
+    #              It does NOT manage the :member relationship. For admin
+    #              flows that may link an existing member, use :create_user.
+    # - :read   -> Standard read used across the app and by admin tooling.
+    # - :destroy-> Standard delete used by admin tooling and maintenance tasks.
+    defaults [:read, :create, :destroy]
+
+    # Primary generic update action:
+    # - Selected by AshAdmin's generated "Edit" UI and generic AshPhoenix
+    #   helpers that assume a default update action.
+    # - Intended for simple attribute updates (e.g., :email) and scenarios
+    #   that do NOT need to manage the :member relationship.
+    # - For linking/unlinking a member (and the related validations), prefer
+    #   the specialized :update_user action below.
+    update :update do
+      primary? true
+
+      # Required because custom validation functions (email validation, member relationship validation)
+      # cannot be executed atomically. These validations need to query the database and perform
+      # complex checks that are not supported in atomic operations.
+      require_atomic? false
+    end
 
     create :create_user do
+      description "Creates a new user with optional member relationship. The member relationship is managed through the :member argument."
+      # Only accept email directly - member_id is NOT in accept list
+      # This prevents direct foreign key manipulation, forcing use of manage_relationship
       accept [:email]
+      # Allow member to be passed as argument for relationship management
+      argument :member, :map, allow_nil?: true
       upsert? true
+
+      # Manage the member relationship during user creation
+      change manage_relationship(:member, :member,
+               # Look up existing member and relate to it
+               on_lookup: :relate,
+               # Error if member doesn't exist in database
+               on_no_match: :error,
+               # If member already linked to this user, ignore (shouldn't happen in create)
+               on_match: :ignore,
+               # If no member provided, that's fine (optional relationship)
+               on_missing: :ignore
+             )
     end
 
     update :update_user do
+      description "Updates a user and manages the optional member relationship. To change an existing member link, first remove it (set member to nil), then add the new one."
+      # Only accept email directly - member_id is NOT in accept list
+      # This prevents direct foreign key manipulation, forcing use of manage_relationship
       accept [:email]
+      # Allow member to be passed as argument for relationship management
+      argument :member, :map, allow_nil?: true
+
+      # Required because custom validation functions (email validation, member relationship validation)
+      # cannot be executed atomically. These validations need to query the database and perform
+      # complex checks that are not supported in atomic operations.
+      require_atomic? false
+
+      # Manage the member relationship during user update
+      change manage_relationship(:member, :member,
+               # Look up existing member and relate to it
+               on_lookup: :relate,
+               # Error if member doesn't exist in database
+               on_no_match: :error,
+               # If same member provided, that's fine (allows updates with same member)
+               on_match: :ignore,
+               # If no member provided, remove existing relationship (allows member removal)
+               on_missing: :unrelate
+             )
     end
 
     # Admin action for direct password changes in admin panel
@@ -76,6 +144,7 @@ defmodule Mv.Accounts.User do
     update :admin_set_password do
       accept [:email]
       argument :password, :string, allow_nil?: false, sensitive?: true
+      require_atomic? false
 
       # Set the strategy context that HashPasswordChange expects
       change set_context(%{strategy_name: :password})
@@ -122,8 +191,54 @@ defmodule Mv.Accounts.User do
   # Global validations - applied to all relevant actions
   validations do
     # Password strength policy: minimum 8 characters for all password-related actions
-    validate string_length(:password, min: 8) do
-      where action_is([:register_with_password, :admin_set_password])
+    validate string_length(:password, min: 8),
+      where: [action_is([:register_with_password, :admin_set_password])],
+      message: "must have length of at least 8"
+
+    # Email validation with EctoCommons.EmailValidator (same as Member)
+    # This ensures consistency between User and Member email validation
+    validate fn changeset, _ ->
+      # Get email from attribute (Ash.CiString) and convert to string
+      email = Ash.Changeset.get_attribute(changeset, :email)
+      email_string = if email, do: to_string(email), else: nil
+
+      # Only validate if email is present
+      if email_string do
+        changeset2 =
+          {%{}, %{email: :string}}
+          |> Ecto.Changeset.cast(%{email: email_string}, [:email])
+          |> EctoCommons.EmailValidator.validate_email(:email, checks: [:html_input, :pow])
+
+        if changeset2.valid? do
+          :ok
+        else
+          {:error, field: :email, message: "is not a valid email"}
+        end
+      else
+        :ok
+      end
+    end
+
+    # Prevent overwriting existing member relationship
+    # This validation ensures race condition safety by requiring explicit two-step process:
+    # 1. Remove existing member (set member to nil)
+    # 2. Add new member
+    # This prevents accidental overwrites when multiple admins work simultaneously
+    validate fn changeset, _context ->
+      member_arg = Ash.Changeset.get_argument(changeset, :member)
+      current_member_id = changeset.data.member_id
+
+      # Only trigger if:
+      # - member argument is provided AND has an ID
+      # - user currently has a member
+      # - the new member ID is different from current member ID
+      if member_arg && member_arg[:id] && current_member_id &&
+           member_arg[:id] != current_member_id do
+        {:error,
+         field: :member, message: "User already has a member. Remove existing member first."}
+      else
+        :ok
+      end
     end
   end
 
@@ -140,18 +255,28 @@ defmodule Mv.Accounts.User do
   attributes do
     uuid_primary_key :id
 
-    attribute :email, :ci_string, allow_nil?: false, public?: true
+    attribute :email, :ci_string do
+      allow_nil? false
+      public? true
+      # Same constraints as Member email for consistency
+      constraints min_length: 5, max_length: 254
+    end
+
     attribute :hashed_password, :string, sensitive?: true, allow_nil?: true
     attribute :oidc_id, :string, allow_nil?: true
   end
 
   relationships do
+    # 1:1 relationship - User can optionally belong to one Member
+    # This automatically creates a `member_id` attribute in the User table
+    # The relationship is optional (allow_nil? true by default)
     belongs_to :member, Mv.Membership.Member
   end
 
   identities do
     identity :unique_email, [:email]
     identity :unique_oidc_id, [:oidc_id]
+    identity :unique_member, [:member_id]
   end
 
   # You can customize this if you wish, but this is a safe default that
diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index 7fe69da..4cec072 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -13,7 +13,11 @@ defmodule Mv.Membership.Member do
 
     create :create_member do
       primary? true
+      # Properties can be created along with member
       argument :properties, {:array, :map}
+      # Allow user to be passed as argument for relationship management
+      # user_id is NOT in accept list to prevent direct foreign key manipulation
+      argument :user, :map, allow_nil?: true
 
       accept [
         :first_name,
@@ -32,12 +36,29 @@ defmodule Mv.Membership.Member do
       ]
 
       change manage_relationship(:properties, type: :create)
+
+      # Manage the user relationship during member creation
+      change manage_relationship(:user, :user,
+               # Look up existing user and relate to it
+               on_lookup: :relate,
+               # Error if user doesn't exist in database
+               on_no_match: :error,
+               # Error if user is already linked to another member (prevents "stealing")
+               on_match: :error,
+               # If no user provided, that's fine (optional relationship)
+               on_missing: :ignore
+             )
     end
 
     update :update_member do
       primary? true
+      # Required because custom validation function cannot be done atomically
       require_atomic? false
+      # Properties can be updated or created along with member
       argument :properties, {:array, :map}
+      # Allow user to be passed as argument for relationship management
+      # user_id is NOT in accept list to prevent direct foreign key manipulation
+      argument :user, :map, allow_nil?: true
 
       accept [
         :first_name,
@@ -56,6 +77,18 @@ defmodule Mv.Membership.Member do
       ]
 
       change manage_relationship(:properties, on_match: :update, on_no_match: :create)
+
+      # Manage the user relationship during member update
+      change manage_relationship(:user, :user,
+               # Look up existing user and relate to it
+               on_lookup: :relate,
+               # Error if user doesn't exist in database
+               on_no_match: :error,
+               # Error if user is already linked to another member (prevents "stealing")
+               on_match: :error,
+               # If no user provided, remove existing relationship (allows user removal)
+               on_missing: :unrelate
+             )
     end
   end
 
@@ -67,6 +100,40 @@ defmodule Mv.Membership.Member do
     validate present(:last_name)
     validate present(:email)
 
+    # Prevent linking to a user that already has a member
+    # This validation prevents "stealing" users from other members by checking
+    # if the target user is already linked to a different member
+    # This is necessary because manage_relationship's on_match: :error only checks
+    # if the user is already linked to THIS specific member, not ANY member
+    validate fn changeset, _context ->
+      user_arg = Ash.Changeset.get_argument(changeset, :user)
+
+      if user_arg && user_arg[:id] do
+        user_id = user_arg[:id]
+        current_member_id = changeset.data.id
+
+        # Check the current state of the user in the database
+        case Ash.get(Mv.Accounts.User, user_id) do
+          # User is free to be linked
+          {:ok, %{member_id: nil}} ->
+            :ok
+
+          # User already linked to this member (update scenario)
+          {:ok, %{member_id: ^current_member_id}} ->
+            :ok
+
+          {:ok, %{member_id: _other_member_id}} ->
+            # User is linked to a different member - prevent "stealing"
+            {:error, field: :user, message: "User is already linked to another member"}
+
+          {:error, _} ->
+            {:error, field: :user, message: "User not found"}
+        end
+      else
+        :ok
+      end
+    end
+
     # Birth date not in the future
     validate compare(:birth_date, less_than_or_equal_to: &Date.utc_today/0),
       where: [present(:birth_date)],
@@ -175,5 +242,14 @@ defmodule Mv.Membership.Member do
 
   relationships do
     has_many :properties, Mv.Membership.Property
+    # 1:1 relationship - Member can optionally have one User
+    # This references the User's member_id attribute
+    # The relationship is optional (allow_nil? true by default)
+    has_one :user, Mv.Accounts.User
+  end
+
+  # Define identities for upsert operations
+  identities do
+    identity :unique_email, [:email]
   end
 end
diff --git a/lib/membership/property.ex b/lib/membership/property.ex
index 2c432a8..de096ca 100644
--- a/lib/membership/property.ex
+++ b/lib/membership/property.ex
@@ -42,4 +42,10 @@ defmodule Mv.Membership.Property do
   calculations do
     calculate :value_to_string, :string, expr(value[:value] <> "")
   end
+
+  # Ensure a member can only have one property per property type
+  # For example: A member can have only one "email" property, one "phone" property, etc.
+  identities do
+    identity :unique_property_per_member, [:member_id, :property_type_id]
+  end
 end
diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex
index 1495bb1..b7f7568 100644
--- a/lib/mv_web/components/layouts.ex
+++ b/lib/mv_web/components/layouts.ex
@@ -14,7 +14,8 @@ defmodule MvWeb.Layouts do
   embed_templates "layouts/*"
 
   @doc """
-  Renders the app layout
+  Renders the app layout. Can be used with or without a current_user.
+  When current_user is present, it will show the navigation bar.
 
   ## Examples
 
@@ -22,9 +23,15 @@ defmodule MvWeb.Layouts do
         <h1>Content</h1>
       </Layout.app>
 
+      <Layouts.app flash={@flash} current_user={@current_user}>
+        <h1>Authenticated Content</h1>
+      </Layout.app>
+
   """
   attr :flash, :map, required: true, doc: "the map of flash messages"
 
+  attr :current_user, :map, default: nil, doc: "the current user, if authenticated"
+
   attr :current_scope, :map,
     default: nil,
     doc: "the current [scope](https://hexdocs.pm/phoenix/scopes.html)"
@@ -33,7 +40,9 @@ defmodule MvWeb.Layouts do
 
   def app(assigns) do
     ~H"""
-    <.navbar />
+    <%= if @current_user do %>
+      <.navbar current_user={@current_user} />
+    <% end %>
     <main class="px-4 py-20 sm:px-6 lg:px-16">
       <div class="mx-auto max-full space-y-4">
         {render_slot(@inner_block)}
diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex
index b917ddc..9fec3f4 100644
--- a/lib/mv_web/components/layouts/navbar.ex
+++ b/lib/mv_web/components/layouts/navbar.ex
@@ -4,6 +4,11 @@ defmodule MvWeb.Layouts.Navbar do
   """
   use Phoenix.Component
   use Gettext, backend: MvWeb.Gettext
+  use MvWeb, :verified_routes
+
+  attr :current_user, :map,
+    required: true,
+    doc: "The current user - navbar is only shown when user is present"
 
   def navbar(assigns) do
     ~H"""
@@ -11,20 +16,27 @@ defmodule MvWeb.Layouts.Navbar do
       <div class="flex-1">
         <a class="btn btn-ghost text-xl">Mitgliederverwaltung</a>
         <ul class="menu menu-horizontal bg-base-200">
-          <li><a href="/members">{gettext("Members")}</a></li>
-          <li><a>Transaktionen</a></li>
+          <li><.link navigate="/members">{gettext("Members")}</.link></li>
+          <li><.link navigate="/users">{gettext("Users")}</.link></li>
         </ul>
       </div>
       <div class="flex gap-2">
         <form method="post" action="/set_locale" class="mr-4">
           <input type="hidden" name="_csrf_token" value={Plug.CSRFProtection.get_csrf_token()} />
-          <select name="locale" onchange="this.form.submit()" class="select select-sm">
+          <label class="sr-only" for="locale-select">{gettext("Select language")}</label>
+          <select
+            id="locale-select"
+            name="locale"
+            onchange="this.form.submit()"
+            class="select select-sm"
+            aria-label={gettext("Select language")}
+          >
             <option value="de" selected={Gettext.get_locale() == "de"}>Deutsch</option>
             <option value="en" selected={Gettext.get_locale() == "en"}>English</option>
           </select>
         </form>
         <!-- Daisy UI Theme Toggle for dark and light mode-->
-        <label class="flex cursor-pointer gap-2">
+        <label class="flex cursor-pointer gap-2" aria-label={gettext("Toggle dark mode")}>
           <svg
             xmlns="http://www.w3.org/2000/svg"
             width="20"
@@ -35,11 +47,17 @@ defmodule MvWeb.Layouts.Navbar do
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
+            aria-hidden="true"
           >
             <circle cx="12" cy="12" r="5" />
             <path d="M12 1v2M12 21v2M4.2 4.2l1.4 1.4M18.4 18.4l1.4 1.4M1 12h2M21 12h2M4.2 19.8l1.4-1.4M18.4 5.6l1.4-1.4" />
           </svg>
-          <input type="checkbox" value="dark" class="toggle theme-controller" />
+          <input
+            type="checkbox"
+            value="dark"
+            class="toggle theme-controller"
+            aria-label={gettext("Toggle dark mode")}
+          />
           <svg
             xmlns="http://www.w3.org/2000/svg"
             width="20"
@@ -50,6 +68,7 @@ defmodule MvWeb.Layouts.Navbar do
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
+            aria-hidden="true"
           >
             <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path>
           </svg>
@@ -65,12 +84,14 @@ defmodule MvWeb.Layouts.Navbar do
             class="menu menu-sm dropdown-content bg-base-100 rounded-box z-1 mt-3 w-52 p-2 shadow"
           >
             <li>
-              <a>
+              <.link navigate={~p"/users/#{@current_user.id}"}>
                 {gettext("Profil")}
-              </a>
+              </.link>
             </li>
             <li><a>{gettext("Settings")}</a></li>
-            <li><a href="sign-out">{gettext("Logout")}</a></li>
+            <li>
+              <.link href={~p"/sign-out"}>{gettext("Logout")}</.link>
+            </li>
           </ul>
         </div>
       </div>
diff --git a/lib/mv_web/live/member_live/form.ex b/lib/mv_web/live/member_live/form.ex
index a526fc3..521d501 100644
--- a/lib/mv_web/live/member_live/form.ex
+++ b/lib/mv_web/live/member_live/form.ex
@@ -4,7 +4,7 @@ defmodule MvWeb.MemberLive.Form do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         {@page_title}
         <:subtitle>
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 4072a51..cb2ccd8 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -1,4 +1,4 @@
-<Layouts.app flash={@flash}>
+<Layouts.app flash={@flash} current_user={@current_user}>
   <.header>
     {gettext("Members")}
     <:actions>
diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex
index 304709c..9a0ef40 100644
--- a/lib/mv_web/live/member_live/show.ex
+++ b/lib/mv_web/live/member_live/show.ex
@@ -5,14 +5,15 @@ defmodule MvWeb.MemberLive.Show do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         {@member.first_name} {@member.last_name}
         <:subtitle>{gettext("This is a member record from your database.")}</:subtitle>
 
         <:actions>
-          <.button navigate={~p"/members"}>
+          <.button navigate={~p"/members"} aria-label={gettext("Back to members list")}>
             <.icon name="hero-arrow-left" />
+            <span class="sr-only">{gettext("Back to members list")}</span>
           </.button>
           <.button variant="primary" navigate={~p"/members/#{@member}/edit?return_to=show"}>
             <.icon name="hero-pencil-square" /> {gettext("Edit Member")}
@@ -37,6 +38,19 @@ defmodule MvWeb.MemberLive.Show do
         <:item title={gettext("Street")}>{@member.street}</:item>
         <:item title={gettext("House Number")}>{@member.house_number}</:item>
         <:item title={gettext("Postal Code")}>{@member.postal_code}</:item>
+        <:item title={gettext("Linked User")}>
+          <%= if @member.user do %>
+            <.link
+              navigate={~p"/users/#{@member.user}"}
+              class="text-blue-600 hover:text-blue-800 underline"
+            >
+              <.icon name="hero-user" class="h-4 w-4 inline mr-1" />
+              {@member.user.email}
+            </.link>
+          <% else %>
+            <span class="text-gray-500 italic">{gettext("No user linked")}</span>
+          <% end %>
+        </:item>
       </.list>
 
       <h3 class="mt-8 mb-2 text-lg font-semibold">{gettext("Custom Properties")}</h3>
@@ -67,7 +81,7 @@ defmodule MvWeb.MemberLive.Show do
     query =
       Mv.Membership.Member
       |> filter(id == ^id)
-      |> load(properties: [:property_type])
+      |> load([:user, properties: [:property_type]])
 
     member = Ash.read_one!(query)
 
diff --git a/lib/mv_web/live/property_live/form.ex b/lib/mv_web/live/property_live/form.ex
index 42814a3..a60a2e4 100644
--- a/lib/mv_web/live/property_live/form.ex
+++ b/lib/mv_web/live/property_live/form.ex
@@ -4,7 +4,7 @@ defmodule MvWeb.PropertyLive.Form do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         {@page_title}
         <:subtitle>{gettext("Use this form to manage property records in your database.")}</:subtitle>
diff --git a/lib/mv_web/live/property_live/index.ex b/lib/mv_web/live/property_live/index.ex
index 7e27344..70171ef 100644
--- a/lib/mv_web/live/property_live/index.ex
+++ b/lib/mv_web/live/property_live/index.ex
@@ -4,7 +4,7 @@ defmodule MvWeb.PropertyLive.Index do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         Listing Properties
         <:actions>
diff --git a/lib/mv_web/live/property_live/show.ex b/lib/mv_web/live/property_live/show.ex
index 6d9bb1a..2a1e2ec 100644
--- a/lib/mv_web/live/property_live/show.ex
+++ b/lib/mv_web/live/property_live/show.ex
@@ -4,7 +4,7 @@ defmodule MvWeb.PropertyLive.Show do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         Property {@property.id}
         <:subtitle>This is a property record from your database.</:subtitle>
diff --git a/lib/mv_web/live/property_type_live/form.ex b/lib/mv_web/live/property_type_live/form.ex
index 87cac94..8b8b452 100644
--- a/lib/mv_web/live/property_type_live/form.ex
+++ b/lib/mv_web/live/property_type_live/form.ex
@@ -4,7 +4,7 @@ defmodule MvWeb.PropertyTypeLive.Form do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         {@page_title}
         <:subtitle>
diff --git a/lib/mv_web/live/property_type_live/index.ex b/lib/mv_web/live/property_type_live/index.ex
index ed9ff7d..dae4da0 100644
--- a/lib/mv_web/live/property_type_live/index.ex
+++ b/lib/mv_web/live/property_type_live/index.ex
@@ -4,7 +4,7 @@ defmodule MvWeb.PropertyTypeLive.Index do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         Listing Property types
         <:actions>
diff --git a/lib/mv_web/live/property_type_live/show.ex b/lib/mv_web/live/property_type_live/show.ex
index 027baa6..ec2b0bf 100644
--- a/lib/mv_web/live/property_type_live/show.ex
+++ b/lib/mv_web/live/property_type_live/show.ex
@@ -4,7 +4,7 @@ defmodule MvWeb.PropertyTypeLive.Show do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         Property type {@property_type.id}
         <:subtitle>This is a property_type record from your database.</:subtitle>
diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex
index e77283a..c7fd2d0 100644
--- a/lib/mv_web/live/user_live/form.ex
+++ b/lib/mv_web/live/user_live/form.ex
@@ -4,7 +4,7 @@ defmodule MvWeb.UserLive.Form do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         {@page_title}
         <:subtitle>{gettext("Use this form to manage user records in your database.")}</:subtitle>
diff --git a/lib/mv_web/live/user_live/index.html.heex b/lib/mv_web/live/user_live/index.html.heex
index 258779e..66e3b9e 100644
--- a/lib/mv_web/live/user_live/index.html.heex
+++ b/lib/mv_web/live/user_live/index.html.heex
@@ -1,4 +1,4 @@
-<Layouts.app flash={@flash}>
+<Layouts.app flash={@flash} current_user={@current_user}>
   <.header>
     {gettext("Listing Users")}
     <:actions>
diff --git a/lib/mv_web/live/user_live/show.ex b/lib/mv_web/live/user_live/show.ex
index 3bf6baf..bdd241b 100644
--- a/lib/mv_web/live/user_live/show.ex
+++ b/lib/mv_web/live/user_live/show.ex
@@ -4,14 +4,15 @@ defmodule MvWeb.UserLive.Show do
   @impl true
   def render(assigns) do
     ~H"""
-    <Layouts.app flash={@flash}>
+    <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
         {gettext("User")} {@user.email}
         <:subtitle>{gettext("This is a user record from your database.")}</:subtitle>
 
         <:actions>
-          <.button navigate={~p"/users"}>
+          <.button navigate={~p"/users"} aria-label={gettext("Back to users list")}>
             <.icon name="hero-arrow-left" />
+            <span class="sr-only">{gettext("Back to users list")}</span>
           </.button>
           <.button variant="primary" navigate={~p"/users/#{@user}/edit?return_to=show"}>
             <.icon name="hero-pencil-square" /> {gettext("Edit User")}
@@ -26,6 +27,19 @@ defmodule MvWeb.UserLive.Show do
         <:item title={gettext("Password Authentication")}>
           {if @user.hashed_password, do: gettext("Enabled"), else: gettext("Not enabled")}
         </:item>
+        <:item title={gettext("Linked Member")}>
+          <%= if @user.member do %>
+            <.link
+              navigate={~p"/members/#{@user.member}"}
+              class="text-blue-600 hover:text-blue-800 underline"
+            >
+              <.icon name="hero-users" class="h-4 w-4 inline mr-1" />
+              {@user.member.first_name} {@user.member.last_name}
+            </.link>
+          <% else %>
+            <span class="text-gray-500 italic">{gettext("No member linked")}</span>
+          <% end %>
+        </:item>
       </.list>
     </Layouts.app>
     """
@@ -33,9 +47,11 @@ defmodule MvWeb.UserLive.Show do
 
   @impl true
   def mount(%{"id" => id}, _session, socket) do
+    user = Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member])
+
     {:ok,
      socket
      |> assign(:page_title, gettext("Show User"))
-     |> assign(:user, Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts))}
+     |> assign(:user, user)}
   end
 end
diff --git a/lib/mv_web/live_user_auth.ex b/lib/mv_web/live_user_auth.ex
index c7b8684..b78ba21 100644
--- a/lib/mv_web/live_user_auth.ex
+++ b/lib/mv_web/live_user_auth.ex
@@ -28,11 +28,16 @@ defmodule MvWeb.LiveUserAuth do
     end
   end
 
-  def on_mount(:live_user_required, _params, _session, socket) do
-    if socket.assigns[:current_user] do
-      {:cont, socket}
-    else
-      {:halt, Phoenix.LiveView.redirect(socket, to: ~p"/sign-in")}
+  def on_mount(:live_user_required, _params, session, socket) do
+    socket = AshAuthentication.Phoenix.LiveSession.assign_new_resources(socket, session)
+
+    case socket.assigns do
+      %{current_user: %{} = user} ->
+        {:cont, assign(socket, :current_user, user)}
+
+      _ ->
+        socket = Phoenix.LiveView.redirect(socket, to: ~p"/sign-in")
+        {:halt, socket}
     end
   end
 
diff --git a/mix.lock b/mix.lock
index a4391ec..28683a3 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,11 +1,11 @@
 %{
-  "ash": {:hex, :ash, "3.5.43", "222f9a8ac26ad3b029f8e69306cc83091c992d858b4538af12e33a148f301cab", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 0.11", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.3.3 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, ">= 0.2.6 and < 1.0.0-0", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "48b2aa274c524f5b968c563dd56aec8f9b278c529c8aa46e6fe0ca564c26cc1c"},
+  "ash": {:hex, :ash, "3.7.1", "abb55dee19e0959e529e52fe0622468825ae05400f535484919713e492d9a9e7", [:mix], [{:crux, "~> 0.1.0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 0.11", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.3.3 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, ">= 0.2.6 and < 1.0.0-0", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4474ce9befe9862d1ed73cadf8a755e836c45a14a7b3b952d02e1a12f2b2e529"},
   "ash_admin": {:hex, :ash_admin, "0.13.19", "43227905381ea0b835039fb3f3d255a3664925619937869e605402bc2f95c5e5", [:mix], [{:ash, ">= 3.4.63 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.1.8 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26", [hex: :gettext, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1-rc", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "41e6262c437164df6f052e43cc93be225a7e148b49a813fc451e70172338ee38"},
   "ash_authentication": {:hex, :ash_authentication, "4.11.0", "4165ede37e179cb0a24b7bfc38d620fa93c05fb6272fbd353cafe27652b1e68b", [:mix], [{:argon2_elixir, "~> 4.0", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:ash, ">= 3.4.29 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, ">= 2.6.8 and < 3.0.0-0", [hex: :ash_postgres, repo: "hexpm", optional: true]}, {:assent, "~> 0.2.13", [hex: :assent, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:finch, "~> 0.19", [hex: :finch, repo: "hexpm", optional: false]}, {:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:joken, "~> 2.5", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}], "hexpm", "8201d0169944c1df3db9b560494e50e1c3bc99c3b1a8a2ef1e61b0f77bc820df"},
-  "ash_authentication_phoenix": {:hex, :ash_authentication_phoenix, "2.11.0", "3dbc3f241fd406a0c072b66e18ac6d38db30eb4220fcdd4ea243b0f5722203c8", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_authentication, ">= 4.9.1 and < 5.0.0-0", [hex: :ash_authentication, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.11 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: true]}, {:igniter, ">= 0.5.25 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:slugify, "~> 1.3", [hex: :slugify, repo: "hexpm", optional: false]}], "hexpm", "3a70376368d550f44cec10d9653aaa0b4dd654f662e4cca407b4c95f4ab3512d"},
-  "ash_phoenix": {:hex, :ash_phoenix, "2.3.16", "d96bd84087c5fcd7b78f7be61754c90bac89ffc7ccc1aa9050918277a7b1fc4e", [:mix], [{:ash, ">= 3.5.13 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:inertia, "~> 2.3", [hex: :inertia, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.6 or ~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.3 or ~> 1.0-rc.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:spark, ">= 2.2.29 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "75c2affee727cd3963146afe5b6b6a9571373afd721a693c6d1694f70075f9fc"},
-  "ash_postgres": {:hex, :ash_postgres, "2.6.20", "08a5288d710633b62714b0396e0a42689a95a5a8cdb7f56a65c8ee6f8c41bffb", [:mix], [{:ash, ">= 3.5.35 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, ">= 0.2.90 and < 1.0.0-0", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.14 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "13d50c216c81516133439b86294f467ab65283007eb8badd0388e9fb4b461423"},
-  "ash_sql": {:hex, :ash_sql, "0.3.0", "2c43ddcc8c7fb51dc25ba3bca965d8b68e7aaecb290cabfed3cf213965aca937", [:mix], [{:ash, ">= 3.5.43 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "ef03759d6a1d4cb189fcadbd183cf047f0565d7d88ea8612d85c9e6e724835e7"},
+  "ash_authentication_phoenix": {:hex, :ash_authentication_phoenix, "2.12.0", "75d7d77e3b626f3d8ea6ee44291d885950172ab399d997b2934f93d2e0a55a61", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_authentication, "~> 4.10", [hex: :ash_authentication, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.11 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: true]}, {:igniter, ">= 0.5.25 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:slugify, "~> 1.3", [hex: :slugify, repo: "hexpm", optional: false]}], "hexpm", "a423e22b40fdf3b1a7f2178e44ca68f48fdb5ba0d87e8d42a43de1a3b63ca704"},
+  "ash_phoenix": {:hex, :ash_phoenix, "2.3.17", "a074ae6d9d7135d99c4edc91ddebe4c035ca380b044592bf9c3d58471669cf52", [:mix], [{:ash, ">= 3.5.13 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:inertia, "~> 2.3", [hex: :inertia, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.6 or ~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.3 or ~> 1.0-rc.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:spark, ">= 2.2.29 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "94e4a6cc6ced31cddba930c45c1c3477aa59b956e7fc3cdc63095cf0e506bdf5"},
+  "ash_postgres": {:hex, :ash_postgres, "2.6.23", "5976a7e5e204b7bc627b1d17026bec9da4d880f2e09cd94bf4e8cee41fef32ce", [:mix], [{:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, ">= 0.3.7 and < 1.0.0-0", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "61de4aedfe30f1ae14d8185cfc37a5b1940b45b60f2dfbdf9eb056f97dca41c5"},
+  "ash_sql": {:hex, :ash_sql, "0.3.7", "80affa5446075d71deb157c67290685a84b392d723be766bfb684f58fe0143de", [:mix], [{:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "ce4d974b8e784171c5a2a62593b3672b42dfd4888fa2239f01a6b32bad769038"},
   "assent": {:hex, :assent, "0.2.13", "11226365d2d8661d23e9a2cf94d3255e81054ff9d88ac877f28bfdf38fa4ef31", [:mix], [{:certifi, ">= 0.0.0", [hex: :certifi, repo: "hexpm", optional: true]}, {:finch, "~> 0.15", [hex: :finch, repo: "hexpm", optional: true]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: true]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:req, "~> 0.4", [hex: :req, repo: "hexpm", optional: true]}, {:ssl_verify_fun, ">= 0.0.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: true]}], "hexpm", "bf9f351b01dd6bceea1d1f157f05438f6765ce606e6eb8d29296003d29bf6eab"},
   "bandit": {:hex, :bandit, "1.8.0", "c2e93d7e3c5c794272fa4623124f827c6f24b643acc822be64c826f9447d92fb", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "8458ff4eed20ff2a2ea69d4854883a077c33ea42b51f6811b044ceee0fa15422"},
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.3.2", "d50091e3c9492d73e17fc1e1619a9b09d6a5ef99160eb4d736926fd475a16ca3", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "471be5151874ae7931911057d1467d908955f93554f7a6cd1b7d804cac8cef53"},
@@ -14,7 +14,8 @@
   "cc_precompiler": {:hex, :cc_precompiler, "0.1.11", "8c844d0b9fb98a3edea067f94f616b3f6b29b959b6b3bf25fee94ffe34364768", [:mix], [{:elixir_make, "~> 0.7", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "3427232caf0835f94680e5bcf082408a70b48ad68a5f5c0b02a3bea9f3a075b9"},
   "circular_buffer": {:hex, :circular_buffer, "1.0.0", "25c004da0cba7bd8bc1bdabded4f9a902d095e20600fd15faf1f2ffbaea18a07", [:mix], [], "hexpm", "c829ec31c13c7bafd1f546677263dff5bfb006e929f25635878ac3cfba8749e5"},
   "comeonin": {:hex, :comeonin, "5.5.1", "5113e5f3800799787de08a6e0db307133850e635d34e9fab23c70b6501669510", [:mix], [], "hexpm", "65aac8f19938145377cee73973f192c5645873dcf550a8a6b18187d17c13ccdb"},
-  "credo": {:hex, :credo, "1.7.12", "9e3c20463de4b5f3f23721527fcaf16722ec815e70ff6c60b86412c695d426c1", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8493d45c656c5427d9c729235b99d498bd133421f3e0a683e5c1b561471291e5"},
+  "credo": {:hex, :credo, "1.7.13", "126a0697df6b7b71cd18c81bc92335297839a806b6f62b61d417500d1070ff4e", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "47641e6d2bbff1e241e87695b29f617f1a8f912adea34296fb10ecc3d7e9e84f"},
+  "crux": {:hex, :crux, "0.1.1", "94f2f97d2a6079ae3c57f356412bc3b307f9579a80e43f526447b1d508dd4a72", [:mix], [{:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: true]}], "hexpm", "e59d498f038193cbe31e448f9199f5b4c53a4c67cece9922bb839595189dd2b6"},
   "db_connection": {:hex, :db_connection, "2.8.1", "9abdc1e68c34c6163f6fb96a96532272d13ad7ca45262156ae8b7ec6d9dc4bec", [], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61a3d489b239d76f326e03b98794fb8e45168396c925ef25feb405ed09da8fd"},
   "decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"},
   "dns_cluster": {:hex, :dns_cluster, "0.2.0", "aa8eb46e3bd0326bd67b84790c561733b25c5ba2fe3c7e36f28e88f384ebcb33", [:mix], [], "hexpm", "ba6f1893411c69c01b9e8e8f772062535a4cf70f3f35bcc964a324078d8c8240"},
@@ -41,7 +42,7 @@
   "jose": {:hex, :jose, "1.11.10", "a903f5227417bd2a08c8a00a0cbcc458118be84480955e8d251297a425723f83", [:mix, :rebar3], [], "hexpm", "0d6cd36ff8ba174db29148fc112b5842186b68a90ce9fc2b3ec3afe76593e614"},
   "lazy_html": {:hex, :lazy_html, "0.1.8", "677a8642e644eef8de98f3040e2520d42d0f0f8bd6c5cd49db36504e34dffe91", [:make, :mix], [{:cc_precompiler, "~> 0.1", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.9.0", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:fine, "~> 0.1.0", [hex: :fine, repo: "hexpm", optional: false]}], "hexpm", "0d8167d930b704feb94b41414ca7f5779dff9bca7fcf619fcef18de138f08736"},
   "libgraph": {:hex, :libgraph, "0.16.0", "3936f3eca6ef826e08880230f806bfea13193e49bf153f93edcf0239d4fd1d07", [:mix], [], "hexpm", "41ca92240e8a4138c30a7e06466acc709b0cbb795c643e9e17174a178982d6bf"},
-  "live_debugger": {:hex, :live_debugger, "0.4.1", "0065bed085e90053f703e8541b646e4c762794588bba79ea557277e00e4ea07b", [:mix], [{:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 0.20.8 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "218459e3d1de32d63d3e06919ea0a836f2c3a668de9d09b4432c82bd4c68e6ab"},
+  "live_debugger": {:hex, :live_debugger, "0.4.2", "775c3a570ef3c44d27d261b3c1aae23ef35cac949a57f67b3e7b1aa1fb2707bc", [:mix], [{:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.8 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "5b24e37985f0424056a322a18dab4a5fb0f4e8ee4e55975985364e0b45d683b9"},
   "luhn": {:hex, :luhn, "0.3.3", "5aa0c6a32c2db4b9db9f9b883ba8301c1ae169d57199b9e6cb1ba2707bc51d96", [:mix], [], "hexpm", "3e823a913a25aab51352c727f135278d22954874d5f0835be81ed4fec3daf78d"},
   "mime": {:hex, :mime, "2.0.7", "b8d739037be7cd402aee1ba0306edfdef982687ee7e9859bee6198c1e7e2f128", [:mix], [], "hexpm", "6171188e399ee16023ffc5b76ce445eb6d9672e2e241d2df6050f3c771e80ccd"},
   "mint": {:hex, :mint, "1.7.1", "113fdb2b2f3b59e47c7955971854641c61f378549d73e829e1768de90fc1abf1", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "fceba0a4d0f24301ddee3024ae116df1c3f4bb7a563a731f45fdfeb9d39a231b"},
@@ -64,9 +65,9 @@
   "postgrex": {:hex, :postgrex, "0.21.1", "2c5cc830ec11e7a0067dd4d623c049b3ef807e9507a424985b8dcf921224cd88", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "27d8d21c103c3cc68851b533ff99eef353e6a0ff98dc444ea751de43eb48bdac"},
   "reactor": {:hex, :reactor, "0.17.0", "eb8bdb530dbae824e2d36a8538f8ec4f3aa7c2d1b61b04959fa787c634f88b49", [:mix], [{:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:iterex, "~> 0.1", [hex: :iterex, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:libgraph, "~> 0.16", [hex: :libgraph, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.3 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.2", [hex: :telemetry, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}, {:ymlr, "~> 5.0", [hex: :ymlr, repo: "hexpm", optional: false]}], "hexpm", "3c3bf71693adbad9117b11ec83cfed7d5851b916ade508ed9718de7ae165bf25"},
   "req": {:hex, :req, "0.5.15", "662020efb6ea60b9f0e0fac9be88cd7558b53fe51155a2d9899de594f9906ba9", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "a6513a35fad65467893ced9785457e91693352c70b58bbc045b47e5eb2ef0c53"},
-  "rewrite": {:hex, :rewrite, "1.1.2", "f5a5d10f5fed1491a6ff48e078d4585882695962ccc9e6c779bae025d1f92eda", [:mix], [{:glob_ex, "~> 0.1", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}, {:text_diff, "~> 0.1", [hex: :text_diff, repo: "hexpm", optional: false]}], "hexpm", "7f8b94b1e3528d0a47b3e8b7bfeca559d2948a65fa7418a9ad7d7712703d39d4"},
+  "rewrite": {:hex, :rewrite, "1.2.0", "80220eb14010e175b67c939397e1a8cdaa2c32db6e2e0a9d5e23e45c0414ce21", [:mix], [{:glob_ex, "~> 0.1", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}, {:text_diff, "~> 0.1", [hex: :text_diff, repo: "hexpm", optional: false]}], "hexpm", "a1cd702bbb9d51613ab21091f04a386d750fc6f4516b81900df082d78b2d8c50"},
   "slugify": {:hex, :slugify, "1.3.1", "0d3b8b7e5c1eeaa960e44dce94382bee34a39b3ea239293e457a9c5b47cc6fd3", [:mix], [], "hexpm", "cb090bbeb056b312da3125e681d98933a360a70d327820e4b7f91645c4d8be76"},
-  "sobelow": {:hex, :sobelow, "0.14.0", "dd82aae8f72503f924fe9dd97ffe4ca694d2f17ec463dcfd365987c9752af6ee", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "7ecf91e298acfd9b24f5d761f19e8f6e6ac585b9387fb6301023f1f2cd5eed5f"},
+  "sobelow": {:hex, :sobelow, "0.14.1", "2f81e8632f15574cba2402bcddff5497b413c01e6f094bc0ab94e83c2f74db81", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8fac9a2bd90fdc4b15d6fca6e1608efb7f7c600fa75800813b794ee9364c87f2"},
   "sourceror": {:hex, :sourceror, "1.10.0", "38397dedbbc286966ec48c7af13e228b171332be1ad731974438c77791945ce9", [:mix], [], "hexpm", "29dbdfc92e04569c9d8e6efdc422fc1d815f4bd0055dc7c51b8800fb75c4b3f1"},
   "spark": {:hex, :spark, "2.3.5", "f30d30ecc3b4ab9b932d9aada66af7677fc1f297a2c349b0bcec3eafb9f996e8", [:mix], [{:igniter, ">= 0.3.64 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:sourceror, "~> 1.2", [hex: :sourceror, repo: "hexpm", optional: true]}], "hexpm", "0e9d339704d5d148f77f2b2fef3bcfc873a9e9bb4224fcf289c545d65827202f"},
   "spitfire": {:hex, :spitfire, "0.2.1", "29e154873f05444669c7453d3d931820822cbca5170e88f0f8faa1de74a79b47", [:mix], [], "hexpm", "6eeed75054a38341b2e1814d41bb0a250564092358de2669fdb57ff88141d91b"},
@@ -74,7 +75,7 @@
   "stream_data": {:hex, :stream_data, "1.2.0", "58dd3f9e88afe27dc38bef26fce0c84a9e7a96772b2925c7b32cd2435697a52b", [:mix], [], "hexpm", "eb5c546ee3466920314643edf68943a5b14b32d1da9fe01698dc92b73f89a9ed"},
   "sweet_xml": {:hex, :sweet_xml, "0.7.5", "803a563113981aaac202a1dbd39771562d0ad31004ddbfc9b5090bdcd5605277", [:mix], [], "hexpm", "193b28a9b12891cae351d81a0cead165ffe67df1b73fe5866d10629f4faefb12"},
   "swoosh": {:hex, :swoosh, "1.19.8", "0576f2ea96d1bb3a6e02cc9f79cbd7d497babc49a353eef8dce1a1f9f82d7915", [:mix], [{:bandit, ">= 1.0.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:idna, "~> 6.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mua, "~> 0.2.3", [hex: :mua, repo: "hexpm", optional: true]}, {:multipart, "~> 0.4", [hex: :multipart, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.5.10 or ~> 0.6 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d7503c2daf0f9899afd8eba9923eeddef4b62e70816e1d3b6766e4d6c60e94ad"},
-  "tailwind": {:hex, :tailwind, "0.4.0", "4b2606713080437e3d94a0fa26527e7425737abc001f172b484b42f43e3274c0", [:mix], [], "hexpm", "530bd35699333f8ea0e9038d7146c2f0932dfec2e3636bd4a8016380c4bc382e"},
+  "tailwind": {:hex, :tailwind, "0.4.1", "e7bcc222fe96a1e55f948e76d13dd84a1a7653fb051d2a167135db3b4b08d3e9", [:mix], [], "hexpm", "6249d4f9819052911120dbdbe9e532e6bd64ea23476056adb7f730aa25c220d1"},
   "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "1.1.0", "5bd5f3b5637e0abea0426b947e3ce5dd304f8b3bc6617039e2b5a008adc02f8f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7b79e8ddfde70adb6db8a6623d1778ec66401f366e9a8f5dd0955c56bc8ce67"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.3.0", "d5c46420126b5ac2d72bc6580fb4f537d35e851cc0f8dbd571acf6d6e10f5ec7", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "51f18bed7128544a50f75897db9974436ea9bfba560420b646af27a9a9b35211"},
diff --git a/priv/gettext/de/LC_MESSAGES/auth.po b/priv/gettext/de/LC_MESSAGES/auth.po
index 661c269..967755e 100644
--- a/priv/gettext/de/LC_MESSAGES/auth.po
+++ b/priv/gettext/de/LC_MESSAGES/auth.po
@@ -27,10 +27,10 @@ msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
 msgid "If this user exists in our database you will contacted with a sign-in link shortly."
-msgstr "Falls dieser Benutzer bekannt ist, wird jetzt eine Email mit Anmelde-Link versendet."
+msgstr "Falls diese*r Benutzer*in bekannt ist, wird jetzt eine Email mit Anmelde-Link versendet."
 
 msgid "If this user exists in our system, you will be contacted with reset instructions shortly."
-msgstr "Falls dieser Benutzer bekannt ist, wird jetzt eine Email mit einer Anleitung zum Zurücksetzen versendet."
+msgstr "Falls diese*r Benutzer*in bekannt ist, wird jetzt eine Email mit einer Anleitung zum Zurücksetzen versendet."
 
 msgid "Need an account?"
 msgstr "Konto anlegen?"
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 14ca2d4..c8c219a 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -21,8 +21,8 @@ msgstr "Aktionen"
 msgid "Are you sure?"
 msgstr "Bist du sicher?"
 
-#: lib/mv_web/components/layouts.ex:71
-#: lib/mv_web/components/layouts.ex:83
+#: lib/mv_web/components/layouts.ex:80
+#: lib/mv_web/components/layouts.ex:92
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr "Verbindung wird wiederhergestellt"
@@ -47,8 +47,8 @@ msgstr "Löschen"
 msgid "Edit"
 msgstr "Bearbeite"
 
-#: lib/mv_web/live/member_live/show.ex:18
-#: lib/mv_web/live/member_live/show.ex:81
+#: lib/mv_web/live/member_live/show.ex:19
+#: lib/mv_web/live/member_live/show.ex:95
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
@@ -58,13 +58,13 @@ msgstr "Mitglied bearbeiten"
 #: lib/mv_web/live/member_live/show.ex:27
 #: lib/mv_web/live/user_live/form.ex:14
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:24
+#: lib/mv_web/live/user_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr "E-Mail"
 
 #: lib/mv_web/live/member_live/form.ex:16
-#: lib/mv_web/live/member_live/show.ex:25
+#: lib/mv_web/live/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr "Vorname"
@@ -77,7 +77,7 @@ msgid "Join Date"
 msgstr "Beitrittsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:17
-#: lib/mv_web/live/member_live/show.ex:26
+#: lib/mv_web/live/member_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr "Nachname"
@@ -93,12 +93,12 @@ msgstr "Neues Mitglied"
 msgid "Show"
 msgstr "Anzeigen"
 
-#: lib/mv_web/components/layouts.ex:78
+#: lib/mv_web/components/layouts.ex:87
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr "Etwas ist schiefgelaufen!"
 
-#: lib/mv_web/components/layouts.ex:66
+#: lib/mv_web/components/layouts.ex:75
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr "Keine Internetverbindung gefunden"
@@ -109,19 +109,19 @@ msgid "close"
 msgstr "schließen"
 
 #: lib/mv_web/live/member_live/form.ex:19
-#: lib/mv_web/live/member_live/show.ex:28
+#: lib/mv_web/live/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:30
-#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr "Eigene Eigenschaften"
 
 #: lib/mv_web/live/member_live/form.ex:23
-#: lib/mv_web/live/member_live/show.ex:34
+#: lib/mv_web/live/member_live/show.ex:35
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr "Austrittsdatum"
@@ -134,13 +134,13 @@ msgid "House Number"
 msgstr "Hausnummer"
 
 #: lib/mv_web/live/member_live/form.ex:24
-#: lib/mv_web/live/member_live/show.ex:35
+#: lib/mv_web/live/member_live/show.ex:36
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notizen"
 
 #: lib/mv_web/live/member_live/form.ex:20
-#: lib/mv_web/live/member_live/show.ex:29
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr "Bezahlt"
@@ -184,17 +184,17 @@ msgstr "Straße"
 msgid "Use this form to manage member records and their properties."
 msgstr "Dieses Formular dient zur Verwaltung von Mitgliedern und deren Eigenschaften."
 
-#: lib/mv_web/live/member_live/show.ex:24
+#: lib/mv_web/live/member_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr "ID"
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
 
-#: lib/mv_web/live/member_live/show.ex:80
+#: lib/mv_web/live/member_live/show.ex:94
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
@@ -204,7 +204,7 @@ msgstr "Mitglied anzeigen"
 msgid "This is a member record from your database."
 msgstr "Dies ist ein Mitglied aus deiner Datenbank."
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
@@ -281,17 +281,17 @@ msgstr "Eigenschaftstyp auswählen"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: lib/mv_web/live/user_live/show.ex:17
+#: lib/mv_web/live/user_live/show.ex:18
 #, elixir-autogen, elixir-format
 msgid "Edit User"
-msgstr "Benutzer bearbeiten"
+msgstr "Benutzer*in bearbeiten"
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:23
+#: lib/mv_web/live/user_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "ID"
 msgstr "ID"
@@ -301,7 +301,7 @@ msgstr "ID"
 msgid "Immutable"
 msgstr "Unveränderlich"
 
-#: lib/mv_web/components/layouts/navbar.ex:73
+#: lib/mv_web/components/layouts/navbar.ex:94
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr "Abmelden"
@@ -310,7 +310,7 @@ msgstr "Abmelden"
 #: lib/mv_web/live/user_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Listing Users"
-msgstr "Benutzer auflisten"
+msgstr "Benutzer*innen auflisten"
 
 #: lib/mv_web/live/property_live/form.ex:27
 #, elixir-autogen, elixir-format
@@ -332,14 +332,14 @@ msgstr "Name"
 #: lib/mv_web/live/user_live/index.html.heex:6
 #, elixir-autogen, elixir-format
 msgid "New User"
-msgstr "Neuer Benutzer"
+msgstr "Neue*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr "Nicht aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "Not set"
 msgstr "Nicht gesetzt"
@@ -351,12 +351,12 @@ msgid "Note"
 msgstr "Hinweis"
 
 #: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "OIDC ID"
 msgstr "OIDC ID"
 
-#: lib/mv_web/live/user_live/show.ex:26
+#: lib/mv_web/live/user_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr "Passwort-Authentifizierung"
@@ -366,15 +366,15 @@ msgstr "Passwort-Authentifizierung"
 msgid "Please select a property type first"
 msgstr "Bitte wählen Sie zuerst einen Eigenschaftstyp"
 
-#: lib/mv_web/components/layouts/navbar.ex:69
+#: lib/mv_web/components/layouts/navbar.ex:89
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr "Profil"
 
 #: lib/mv_web/live/property_live/form.ex:207
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Property %{action} successfully"
-msgstr "Mitglied %{action} erfolgreich"
+msgstr "Eigenschaft %{action} erfolgreich"
 
 #: lib/mv_web/live/property_live/form.ex:18
 #, elixir-autogen, elixir-format
@@ -401,17 +401,17 @@ msgstr "Eigenschaft speichern"
 msgid "Save Property type"
 msgstr "Eigenschaftstyp speichern"
 
-#: lib/mv_web/live/member_live/index.html.heex:27
+#: lib/mv_web/live/member_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Select all members"
 msgstr "Alle Mitglieder auswählen"
 
-#: lib/mv_web/live/member_live/index.html.heex:41
+#: lib/mv_web/live/member_live/index.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Select member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:72
+#: lib/mv_web/components/layouts/navbar.ex:92
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
@@ -419,17 +419,17 @@ msgstr "Einstellungen"
 #: lib/mv_web/live/user_live/form.ex:93
 #, elixir-autogen, elixir-format
 msgid "Save User"
-msgstr "Benutzer speichern"
+msgstr "Benutzer*in speichern"
 
-#: lib/mv_web/live/user_live/show.ex:38
+#: lib/mv_web/live/user_live/show.ex:54
 #, elixir-autogen, elixir-format
 msgid "Show User"
-msgstr "Benutzer anzeigen"
+msgstr "Benutzer*in anzeigen"
 
 #: lib/mv_web/live/user_live/show.ex:10
 #, elixir-autogen, elixir-format
 msgid "This is a user record from your database."
-msgstr "Dies ist ein Benutzer-Datensatz aus Ihrer Datenbank."
+msgstr "Dies ist ein Benutzer*innen-Datensatz aus Ihrer Datenbank."
 
 #: lib/mv_web/live/property_live/form.ex:95
 #, elixir-autogen, elixir-format
@@ -437,25 +437,25 @@ msgid "Unsupported value type: %{type}"
 msgstr "Nicht unterstützter Wertetyp: %{type}"
 
 #: lib/mv_web/live/property_live/form.ex:10
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Use this form to manage property records in your database."
-msgstr "Dieses Formular dient zur Verwaltung von Mitgliedern und deren Eigenschaften."
+msgstr "Dieses Formular dient zur Verwaltung von Eigenschaften in der Datenbank."
 
 #: lib/mv_web/live/property_type_live/form.ex:11
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Use this form to manage property_type records in your database."
-msgstr "Dieses Formular dient zur Verwaltung von Mitgliedern und deren Eigenschaften."
+msgstr "Dieses Formular dient zur Verwaltung von Eigenschaftstypen in der Datenbank."
 
 #: lib/mv_web/live/user_live/form.ex:10
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage user records in your database."
-msgstr "Verwenden Sie dieses Formular, um Benutzer-Datensätze zu verwalten."
+msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten."
 
 #: lib/mv_web/live/user_live/form.ex:110
 #: lib/mv_web/live/user_live/show.ex:9
 #, elixir-autogen, elixir-format
 msgid "User"
-msgstr "Benutzer"
+msgstr "Benutzer*in"
 
 #: lib/mv_web/live/property_live/form.ex:59
 #, elixir-autogen, elixir-format
@@ -482,17 +482,17 @@ msgstr "absteigend"
 #: lib/mv_web/live/user_live/form.ex:109
 #, elixir-autogen, elixir-format
 msgid "New"
-msgstr "Neuer"
+msgstr "Neue*r"
 
 #: lib/mv_web/live/user_live/form.ex:64
 #, elixir-autogen, elixir-format
 msgid "Admin Note"
-msgstr "Administrator-Hinweis"
+msgstr "Administrator*innen-Hinweis"
 
 #: lib/mv_web/live/user_live/form.ex:64
 #, elixir-autogen, elixir-format
 msgid "As an administrator, you can directly set a new password for this user using the same secure Ash Authentication system."
-msgstr "Als Administrator können Sie direkt ein neues Passwort für diesen Benutzer setzen, wobei das gleiche sichere Ash Authentication System verwendet wird."
+msgstr "Als Administrator*in können Sie direkt ein neues Passwort für diese*n Benutzer*in setzen, wobei das gleiche sichere Ash Authentication System verwendet wird."
 
 #: lib/mv_web/live/user_live/form.ex:55
 #, elixir-autogen, elixir-format
@@ -507,7 +507,7 @@ msgstr "Passwort ändern"
 #: lib/mv_web/live/user_live/form.ex:75
 #, elixir-autogen, elixir-format
 msgid "Check 'Change Password' above to set a new password for this user."
-msgstr "Aktivieren Sie 'Passwort ändern' oben, um ein neues Passwort für diesen Benutzer zu setzen."
+msgstr "Aktivieren Sie 'Passwort ändern' oben, um ein neues Passwort für diese*n Benutzer*in zu setzen."
 
 #: lib/mv_web/live/user_live/form.ex:45
 #, elixir-autogen, elixir-format
@@ -537,12 +537,12 @@ msgstr "Passwort-Anforderungen"
 #: lib/mv_web/live/user_live/index.html.heex:21
 #, elixir-autogen, elixir-format
 msgid "Select all users"
-msgstr "Alle Benutzer auswählen"
+msgstr "Alle Benutzer*innen auswählen"
 
 #: lib/mv_web/live/user_live/index.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Select user"
-msgstr "Benutzer auswählen"
+msgstr "Benutzer*in auswählen"
 
 #: lib/mv_web/live/user_live/form.ex:27
 #, elixir-autogen, elixir-format
@@ -552,9 +552,54 @@ msgstr "Passwort setzen"
 #: lib/mv_web/live/user_live/form.ex:83
 #, elixir-autogen, elixir-format
 msgid "User will be created without a password. Check 'Set Password' to add one."
-msgstr "Benutzer wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen."
+msgstr "Benutzer*in wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen."
 
-#: lib/mv_web/live/components/sort_header_component.ex:60
+#: lib/mv_web/live/user_live/show.ex:30
+#, elixir-autogen, elixir-format
+msgid "Linked Member"
+msgstr "Verknüpftes Mitglied"
+
+#: lib/mv_web/live/member_live/show.ex:41
+#, elixir-autogen, elixir-format
+msgid "Linked User"
+msgstr "Verknüpfte*r Benutzer*in"
+
+#: lib/mv_web/live/user_live/show.ex:40
+#, elixir-autogen, elixir-format
+msgid "No member linked"
+msgstr "Kein Mitglied verknüpft"
+
+#: lib/mv_web/live/member_live/show.ex:51
+#, elixir-autogen, elixir-format
+msgid "No user linked"
+msgstr "Keine*r Benutzer*in verknüpft"
+
+#: lib/mv_web/live/member_live/show.ex:14
+#: lib/mv_web/live/member_live/show.ex:16
+#, elixir-autogen, elixir-format
+msgid "Back to members list"
+msgstr "Zurück zur Mitgliederliste"
+
+#: lib/mv_web/live/user_live/show.ex:13
+#: lib/mv_web/live/user_live/show.ex:15
+#, elixir-autogen, elixir-format
+msgid "Back to users list"
+msgstr "Zurück zur Benutzer*innen-Liste"
+
+#: lib/mv_web/components/layouts/navbar.ex:27
+#: lib/mv_web/components/layouts/navbar.ex:33
+#, elixir-autogen, elixir-format
+msgid "Select language"
+msgstr "Sprache auswählen"
+
+#: lib/mv_web/components/layouts/navbar.ex:40
+#: lib/mv_web/components/layouts/navbar.ex:60
+#, elixir-autogen, elixir-format
+msgid "Toggle dark mode"
+msgstr "Dunklen Modus umschalten"
+
+#: lib/mv_web/live/components/search_bar_component.ex:15
+#: lib/mv_web/live/member_live/index.html.heex:15
 #, elixir-autogen, elixir-format
 msgid "Click to sort"
 msgstr "Klicke um zu sortieren"
diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po
index 844c4f5..e0db8dd 100644
--- a/priv/gettext/de/LC_MESSAGES/errors.po
+++ b/priv/gettext/de/LC_MESSAGES/errors.po
@@ -12,101 +12,146 @@ msgstr ""
 
 ## From Ecto.Changeset.cast/4
 msgid "can't be blank"
-msgstr ""
+msgstr "darf nicht leer sein"
 
 ## From Ecto.Changeset.unique_constraint/3
 msgid "has already been taken"
-msgstr ""
+msgstr "ist bereits vergeben"
 
 ## From Ecto.Changeset.put_change/3
 msgid "is invalid"
-msgstr ""
+msgstr "ist ungültig"
 
 ## From Ecto.Changeset.validate_acceptance/3
 msgid "must be accepted"
-msgstr ""
+msgstr "muss akzeptiert werden"
 
 ## From Ecto.Changeset.validate_format/3
 msgid "has invalid format"
-msgstr ""
+msgstr "hat ein ungültiges Format"
 
 ## From Ecto.Changeset.validate_subset/3
 msgid "has an invalid entry"
-msgstr ""
+msgstr "hat einen ungültigen Eintrag"
 
 ## From Ecto.Changeset.validate_exclusion/3
 msgid "is reserved"
-msgstr ""
+msgstr "ist reserviert"
 
 ## From Ecto.Changeset.validate_confirmation/3
 msgid "does not match confirmation"
-msgstr ""
+msgstr "stimmt nicht mit der Bestätigung überein"
 
 ## From Ecto.Changeset.no_assoc_constraint/3
 msgid "is still associated with this entry"
-msgstr ""
+msgstr "ist noch mit diesem Eintrag verknüpft"
 
 msgid "are still associated with this entry"
-msgstr ""
+msgstr "sind noch mit diesem Eintrag verknüpft"
 
 ## From Ecto.Changeset.validate_length/3
 msgid "should have %{count} item(s)"
 msgid_plural "should have %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte %{count} Element haben"
+msgstr[1] "sollte %{count} Elemente haben"
 
 msgid "should be %{count} character(s)"
 msgid_plural "should be %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte %{count} Zeichen haben"
+msgstr[1] "sollte %{count} Zeichen haben"
 
 msgid "should be %{count} byte(s)"
 msgid_plural "should be %{count} byte(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte %{count} Byte haben"
+msgstr[1] "sollte %{count} Bytes haben"
 
 msgid "should have at least %{count} item(s)"
 msgid_plural "should have at least %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte mindestens %{count} Element haben"
+msgstr[1] "sollte mindestens %{count} Elemente haben"
 
 msgid "should be at least %{count} character(s)"
 msgid_plural "should be at least %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte mindestens %{count} Zeichen haben"
+msgstr[1] "sollte mindestens %{count} Zeichen haben"
 
 msgid "should be at least %{count} byte(s)"
 msgid_plural "should be at least %{count} byte(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte mindestens %{count} Byte haben"
+msgstr[1] "sollte mindestens %{count} Bytes haben"
 
 msgid "should have at most %{count} item(s)"
 msgid_plural "should have at most %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte höchstens %{count} Element haben"
+msgstr[1] "sollte höchstens %{count} Elemente haben"
 
 msgid "should be at most %{count} character(s)"
 msgid_plural "should be at most %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte höchstens %{count} Zeichen haben"
+msgstr[1] "sollte höchstens %{count} Zeichen haben"
 
 msgid "should be at most %{count} byte(s)"
 msgid_plural "should be at most %{count} byte(s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sollte höchstens %{count} Byte haben"
+msgstr[1] "sollte höchstens %{count} Bytes haben"
 
 ## From Ecto.Changeset.validate_number/3
 msgid "must be less than %{number}"
-msgstr ""
+msgstr "muss kleiner als %{number} sein"
 
 msgid "must be greater than %{number}"
-msgstr ""
+msgstr "muss größer als %{number} sein"
 
 msgid "must be less than or equal to %{number}"
-msgstr ""
+msgstr "muss kleiner oder gleich %{number} sein"
 
 msgid "must be greater than or equal to %{number}"
-msgstr ""
+msgstr "muss größer oder gleich %{number} sein"
 
 msgid "must be equal to %{number}"
-msgstr ""
+msgstr "muss gleich %{number} sein"
+
+## Ash Framework - Standard constraint messages
+msgid "length must be greater than or equal to %{min}"
+msgstr "muss mindestens %{min} Zeichen lang sein"
+
+msgid "length must be less than or equal to %{max}"
+msgstr "darf höchstens %{max} Zeichen lang sein"
+
+msgid "must be present"
+msgstr "muss vorhanden sein"
+
+## Custom validation messages from Mv.Accounts.User
+msgid "User already has a member. Remove existing member first."
+msgstr "Benutzer*in hat bereits ein Mitglied. Entfernen Sie zuerst das vorhandene Mitglied."
+
+msgid "OIDC user_info must contain a non-empty 'sub' or 'id' field"
+msgstr "OIDC user_info darf kein leeres 'sub' oder 'id' Feld enthalten"
+
+## Custom validation messages from Mv.Membership.Member
+msgid "User is already linked to another member"
+msgstr "Benutzer*in ist bereits mit einem anderen Mitglied verknüpft"
+
+msgid "User not found"
+msgstr "Benutzer*in nicht gefunden"
+
+msgid "cannot be in the future"
+msgstr "darf nicht in der Zukunft liegen"
+
+msgid "cannot be before join date"
+msgstr "darf nicht vor dem Beitrittsdatum liegen"
+
+msgid "is not a valid phone number"
+msgstr "ist keine gültige Telefonnummer"
+
+msgid "must consist of 5 digits"
+msgstr "muss aus 5 Ziffern bestehen"
+
+msgid "is not a valid email"
+msgstr "ist keine gültige E-Mail-Adresse"
+
+msgid "must have length of at least 8"
+msgstr "muss mindestens 8 Zeichen lang sein"
+
+msgid "is required"
+msgstr "ist erforderlich"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 58a0182..4c5438a 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -22,8 +22,8 @@ msgstr ""
 msgid "Are you sure?"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:71
-#: lib/mv_web/components/layouts.ex:83
+#: lib/mv_web/components/layouts.ex:80
+#: lib/mv_web/components/layouts.ex:92
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr ""
@@ -48,8 +48,8 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:18
-#: lib/mv_web/live/member_live/show.ex:81
+#: lib/mv_web/live/member_live/show.ex:19
+#: lib/mv_web/live/member_live/show.ex:95
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
@@ -59,13 +59,13 @@ msgstr ""
 #: lib/mv_web/live/member_live/show.ex:27
 #: lib/mv_web/live/user_live/form.ex:14
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:24
+#: lib/mv_web/live/user_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:16
-#: lib/mv_web/live/member_live/show.ex:25
+#: lib/mv_web/live/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
@@ -78,7 +78,7 @@ msgid "Join Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:17
-#: lib/mv_web/live/member_live/show.ex:26
+#: lib/mv_web/live/member_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:78
+#: lib/mv_web/components/layouts.ex:87
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:66
+#: lib/mv_web/components/layouts.ex:75
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr ""
@@ -110,19 +110,19 @@ msgid "close"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:19
-#: lib/mv_web/live/member_live/show.ex:28
+#: lib/mv_web/live/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:30
-#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:23
-#: lib/mv_web/live/member_live/show.ex:34
+#: lib/mv_web/live/member_live/show.ex:35
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
@@ -135,13 +135,13 @@ msgid "House Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:24
-#: lib/mv_web/live/member_live/show.ex:35
+#: lib/mv_web/live/member_live/show.ex:36
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:20
-#: lib/mv_web/live/member_live/show.ex:29
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
@@ -185,17 +185,17 @@ msgstr ""
 msgid "Use this form to manage member records and their properties."
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:24
+#: lib/mv_web/live/member_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:80
+#: lib/mv_web/live/member_live/show.ex:94
 #, elixir-autogen, elixir-format
 msgid "Show Member"
 msgstr ""
@@ -205,7 +205,7 @@ msgstr ""
 msgid "This is a member record from your database."
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -282,17 +282,17 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:17
+#: lib/mv_web/live/user_live/show.ex:18
 #, elixir-autogen, elixir-format
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:23
+#: lib/mv_web/live/user_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "ID"
 msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:73
+#: lib/mv_web/components/layouts/navbar.ex:94
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -335,12 +335,12 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "Not set"
 msgstr ""
@@ -352,12 +352,12 @@ msgid "Note"
 msgstr ""
 
 #: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "OIDC ID"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:26
+#: lib/mv_web/live/user_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
@@ -367,7 +367,7 @@ msgstr ""
 msgid "Please select a property type first"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:69
+#: lib/mv_web/components/layouts/navbar.ex:89
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -402,17 +402,17 @@ msgstr ""
 msgid "Save Property type"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:27
+#: lib/mv_web/live/member_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Select all members"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:41
+#: lib/mv_web/live/member_live/index.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:72
+#: lib/mv_web/components/layouts/navbar.ex:92
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -422,7 +422,7 @@ msgstr ""
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:38
+#: lib/mv_web/live/user_live/show.ex:54
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr ""
@@ -555,6 +555,59 @@ msgstr ""
 msgid "User will be created without a password. Check 'Set Password' to add one."
 msgstr ""
 
+#: lib/mv_web/live/user_live/show.ex:30
+#, elixir-autogen, elixir-format
+msgid "Linked Member"
+msgstr ""
+
+#: lib/mv_web/live/member_live/show.ex:41
+#, elixir-autogen, elixir-format
+msgid "Linked User"
+msgstr ""
+
+#: lib/mv_web/live/user_live/show.ex:40
+#, elixir-autogen, elixir-format
+msgid "No member linked"
+msgstr ""
+
+#: lib/mv_web/live/member_live/show.ex:51
+#, elixir-autogen, elixir-format
+msgid "No user linked"
+msgstr ""
+
+#: lib/mv_web/live/member_live/show.ex:14
+#: lib/mv_web/live/member_live/show.ex:16
+#, elixir-autogen, elixir-format
+msgid "Back to members list"
+msgstr ""
+
+#: lib/mv_web/live/user_live/show.ex:13
+#: lib/mv_web/live/user_live/show.ex:15
+#, elixir-autogen, elixir-format
+msgid "Back to users list"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:27
+#: lib/mv_web/components/layouts/navbar.ex:33
+#, elixir-autogen, elixir-format
+msgid "Select language"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:40
+#: lib/mv_web/components/layouts/navbar.ex:60
+#, elixir-autogen, elixir-format
+msgid "Toggle dark mode"
+msgstr ""
+
+#: lib/mv_web/live/components/search_bar_component.ex:15
+#: lib/mv_web/live/member_live/index.html.heex:15
+#, elixir-autogen, elixir-format
+msgid "Search..."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:20
+#, elixir-autogen, elixir-format
+msgid "Users"
 #: lib/mv_web/live/components/sort_header_component.ex:60
 #, elixir-autogen, elixir-format
 msgid "Click to sort"
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 6311138..451ba84 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -22,8 +22,8 @@ msgstr ""
 msgid "Are you sure?"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:71
-#: lib/mv_web/components/layouts.ex:83
+#: lib/mv_web/components/layouts.ex:80
+#: lib/mv_web/components/layouts.ex:92
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr ""
@@ -48,8 +48,8 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:18
-#: lib/mv_web/live/member_live/show.ex:81
+#: lib/mv_web/live/member_live/show.ex:19
+#: lib/mv_web/live/member_live/show.ex:95
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
@@ -59,13 +59,13 @@ msgstr ""
 #: lib/mv_web/live/member_live/show.ex:27
 #: lib/mv_web/live/user_live/form.ex:14
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:24
+#: lib/mv_web/live/user_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:16
-#: lib/mv_web/live/member_live/show.ex:25
+#: lib/mv_web/live/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
@@ -78,7 +78,7 @@ msgid "Join Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:17
-#: lib/mv_web/live/member_live/show.ex:26
+#: lib/mv_web/live/member_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:78
+#: lib/mv_web/components/layouts.ex:87
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:66
+#: lib/mv_web/components/layouts.ex:75
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr ""
@@ -110,19 +110,19 @@ msgid "close"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:19
-#: lib/mv_web/live/member_live/show.ex:28
+#: lib/mv_web/live/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:30
-#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:23
-#: lib/mv_web/live/member_live/show.ex:34
+#: lib/mv_web/live/member_live/show.ex:35
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
@@ -135,13 +135,13 @@ msgid "House Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:24
-#: lib/mv_web/live/member_live/show.ex:35
+#: lib/mv_web/live/member_live/show.ex:36
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:20
-#: lib/mv_web/live/member_live/show.ex:29
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
@@ -185,17 +185,17 @@ msgstr ""
 msgid "Use this form to manage member records and their properties."
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:24
+#: lib/mv_web/live/member_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:80
+#: lib/mv_web/live/member_live/show.ex:94
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr ""
@@ -205,7 +205,7 @@ msgstr ""
 msgid "This is a member record from your database."
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -282,17 +282,17 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:17
+#: lib/mv_web/live/user_live/show.ex:18
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:23
+#: lib/mv_web/live/user_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "ID"
 msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:73
+#: lib/mv_web/components/layouts/navbar.ex:94
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -335,12 +335,12 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Not set"
 msgstr ""
@@ -352,12 +352,12 @@ msgid "Note"
 msgstr ""
 
 #: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "OIDC ID"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:26
+#: lib/mv_web/live/user_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
@@ -367,7 +367,7 @@ msgstr ""
 msgid "Please select a property type first"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:69
+#: lib/mv_web/components/layouts/navbar.ex:89
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -402,17 +402,17 @@ msgstr ""
 msgid "Save Property type"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:27
+#: lib/mv_web/live/member_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Select all members"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:41
+#: lib/mv_web/live/member_live/index.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:72
+#: lib/mv_web/components/layouts/navbar.ex:92
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -422,7 +422,7 @@ msgstr ""
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:38
+#: lib/mv_web/live/user_live/show.ex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show User"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po
index 844c4f5..62df4a7 100644
--- a/priv/gettext/en/LC_MESSAGES/errors.po
+++ b/priv/gettext/en/LC_MESSAGES/errors.po
@@ -110,3 +110,48 @@ msgstr ""
 
 msgid "must be equal to %{number}"
 msgstr ""
+
+## Ash Framework - Standard constraint messages
+msgid "length must be greater than or equal to %{min}"
+msgstr ""
+
+msgid "length must be less than or equal to %{max}"
+msgstr ""
+
+msgid "must be present"
+msgstr ""
+
+## Custom validation messages from Mv.Accounts.User
+msgid "User already has a member. Remove existing member first."
+msgstr ""
+
+msgid "OIDC user_info must contain a non-empty 'sub' or 'id' field"
+msgstr ""
+
+## Custom validation messages from Mv.Membership.Member
+msgid "User is already linked to another member"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+msgid "cannot be in the future"
+msgstr ""
+
+msgid "cannot be before join date"
+msgstr ""
+
+msgid "is not a valid phone number"
+msgstr ""
+
+msgid "must consist of 5 digits"
+msgstr ""
+
+msgid "is not a valid email"
+msgstr ""
+
+msgid "must have length of at least 8"
+msgstr ""
+
+msgid "is required"
+msgstr ""
diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot
index eef2de2..8f522c0 100644
--- a/priv/gettext/errors.pot
+++ b/priv/gettext/errors.pot
@@ -107,3 +107,48 @@ msgstr ""
 
 msgid "must be equal to %{number}"
 msgstr ""
+
+## Ash Framework - Standard constraint messages
+msgid "length must be greater than or equal to %{min}"
+msgstr ""
+
+msgid "length must be less than or equal to %{max}"
+msgstr ""
+
+msgid "must be present"
+msgstr ""
+
+## Custom validation messages from Mv.Accounts.User
+msgid "User already has a member. Remove existing member first."
+msgstr ""
+
+msgid "OIDC user_info must contain a non-empty 'sub' or 'id' field"
+msgstr ""
+
+## Custom validation messages from Mv.Membership.Member
+msgid "User is already linked to another member"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+msgid "cannot be in the future"
+msgstr ""
+
+msgid "cannot be before join date"
+msgstr ""
+
+msgid "is not a valid phone number"
+msgstr ""
+
+msgid "must consist of 5 digits"
+msgstr ""
+
+msgid "is not a valid email"
+msgstr ""
+
+msgid "must have length of at least 8"
+msgstr ""
+
+msgid "is required"
+msgstr ""
diff --git a/priv/repo/migrations/20250926164519_member_relation.exs b/priv/repo/migrations/20250926164519_member_relation.exs
new file mode 100644
index 0000000..1f63f73
--- /dev/null
+++ b/priv/repo/migrations/20250926164519_member_relation.exs
@@ -0,0 +1,19 @@
+defmodule Mv.Repo.Migrations.MemberRelation do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    # Ensure 1:1 relationship - one user can only be linked to one member
+    # This prevents multiple users from sharing the same member account
+    create unique_index(:users, [:member_id], name: "users_unique_member_index")
+  end
+
+  def down do
+    drop_if_exists unique_index(:users, [:member_id], name: "users_unique_member_index")
+  end
+end
diff --git a/priv/repo/migrations/20250926180341_add_unique_email_to_members.exs b/priv/repo/migrations/20250926180341_add_unique_email_to_members.exs
new file mode 100644
index 0000000..a33ce2f
--- /dev/null
+++ b/priv/repo/migrations/20250926180341_add_unique_email_to_members.exs
@@ -0,0 +1,19 @@
+defmodule Mv.Repo.Migrations.AddUniqueEmailToMembers do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    # Ensure email uniqueness across all members
+    # This supports upsert operations and prevents duplicate member accounts
+    create unique_index(:members, [:email], name: "members_unique_email_index")
+  end
+
+  def down do
+    drop_if_exists unique_index(:members, [:email], name: "members_unique_email_index")
+  end
+end
diff --git a/priv/repo/migrations/20251016130855_add_constraints_for_user_member_and_property.exs b/priv/repo/migrations/20251016130855_add_constraints_for_user_member_and_property.exs
new file mode 100644
index 0000000..ee13a71
--- /dev/null
+++ b/priv/repo/migrations/20251016130855_add_constraints_for_user_member_and_property.exs
@@ -0,0 +1,46 @@
+defmodule Mv.Repo.Migrations.AddConstraintsForUserMemberAndProperty do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    drop constraint(:users, "users_member_id_fkey")
+
+    alter table(:users) do
+      modify :member_id,
+             references(:members,
+               column: :id,
+               name: "users_member_id_fkey",
+               type: :uuid,
+               prefix: "public",
+               on_delete: :nilify_all
+             )
+    end
+
+    create unique_index(:properties, [:member_id, :property_type_id],
+             name: "properties_unique_property_per_member_index"
+           )
+  end
+
+  def down do
+    drop_if_exists unique_index(:properties, [:member_id, :property_type_id],
+                     name: "properties_unique_property_per_member_index"
+                   )
+
+    drop constraint(:users, "users_member_id_fkey")
+
+    alter table(:users) do
+      modify :member_id,
+             references(:members,
+               column: :id,
+               name: "users_member_id_fkey",
+               type: :uuid,
+               prefix: "public"
+             )
+    end
+  end
+end
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index 166b533..a0299fd 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -48,7 +48,7 @@ Accounts.create_user!(%{email: "admin@mv.local"}, upsert?: true, upsert_identity
 |> Ash.Changeset.for_update(:admin_set_password, %{password: "testpassword"})
 |> Ash.update!()
 
-# Create sample members for testing
+# Create sample members for testing - use upsert to prevent duplicates
 for member_attrs <- [
       %{
         first_name: "Hans",
@@ -102,5 +102,96 @@ for member_attrs <- [
         house_number: "8"
       }
     ] do
-  Membership.create_member!(member_attrs)
+  # Use upsert to prevent duplicates based on email
+  Membership.create_member!(member_attrs, upsert?: true, upsert_identity: :unique_email)
 end
+
+# Create additional users for user-member linking examples
+additional_users = [
+  %{email: "hans.mueller@example.de"},
+  %{email: "greta.schmidt@example.de"},
+  %{email: "maria.weber@example.de"},
+  %{email: "thomas.klein@example.de"}
+]
+
+created_users =
+  Enum.map(additional_users, fn user_attrs ->
+    Accounts.create_user!(user_attrs, upsert?: true, upsert_identity: :unique_email)
+    |> Ash.Changeset.for_update(:admin_set_password, %{password: "testpassword"})
+    |> Ash.update!()
+  end)
+
+# Create members with linked users to demonstrate the 1:1 relationship
+# Only create if users don't already have members
+linked_members = [
+  %{
+    first_name: "Maria",
+    last_name: "Weber",
+    email: "maria.weber@example.de",
+    birth_date: ~D[1992-07-14],
+    join_date: ~D[2023-03-15],
+    paid: true,
+    phone_number: "+49301357924",
+    city: "Frankfurt",
+    street: "Goetheplatz",
+    house_number: "5",
+    postal_code: "60313",
+    notes: "Linked to user account",
+    # Link to the third user (maria.weber@example.de)
+    user: Enum.at(created_users, 2)
+  },
+  %{
+    first_name: "Thomas",
+    last_name: "Klein",
+    email: "thomas.klein@example.de",
+    birth_date: ~D[1988-12-03],
+    join_date: ~D[2023-04-01],
+    paid: false,
+    phone_number: "+49302468135",
+    city: "Köln",
+    street: "Rheinstraße",
+    house_number: "23",
+    postal_code: "50667",
+    notes: "Linked to user account - needs payment follow-up",
+    # Link to the fourth user (thomas.klein@example.de)
+    user: Enum.at(created_users, 3)
+  }
+]
+
+# Create the linked members - use upsert to prevent duplicates
+Enum.each(linked_members, fn member_attrs ->
+  user = member_attrs.user
+  member_attrs_without_user = Map.delete(member_attrs, :user)
+
+  # Check if user already has a member
+  if user.member_id == nil do
+    # User is free, create member and link - use upsert to prevent duplicates
+    Membership.create_member!(
+      Map.put(member_attrs_without_user, :user, %{id: user.id}),
+      upsert?: true,
+      upsert_identity: :unique_email
+    )
+  else
+    # User already has a member, just create the member without linking - use upsert to prevent duplicates
+    Membership.create_member!(member_attrs_without_user,
+      upsert?: true,
+      upsert_identity: :unique_email
+    )
+  end
+end)
+
+IO.puts("✅ Seeds completed successfully!")
+IO.puts("📝 Created sample data:")
+IO.puts("   - Property types: String, Date, Boolean, Email")
+IO.puts("   - Admin user: admin@mv.local (password: testpassword)")
+IO.puts("   - Sample members: Hans, Greta, Friedrich")
+
+IO.puts(
+  "   - Additional users: hans.mueller@example.de, greta.schmidt@example.de, maria.weber@example.de, thomas.klein@example.de"
+)
+
+IO.puts(
+  "   - Linked members: Maria Weber ↔ maria.weber@example.de, Thomas Klein ↔ thomas.klein@example.de"
+)
+
+IO.puts("🔗 Visit the application to see user-member relationships in action!")
diff --git a/priv/resource_snapshots/repo/members/20250926180341.json b/priv/resource_snapshots/repo/members/20250926180341.json
new file mode 100644
index 0000000..3582051
--- /dev/null
+++ b/priv/resource_snapshots/repo/members/20250926180341.json
@@ -0,0 +1,202 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"uuid_generate_v7()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "first_name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "last_name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "email",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "birth_date",
+      "type": "date"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "paid",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "phone_number",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "join_date",
+      "type": "date"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "exit_date",
+      "type": "date"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "notes",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "city",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "street",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "house_number",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "postal_code",
+      "type": "text"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "5F070A1E5BEE9883AE864FB5A4A5E81F487A1C57D41576C23BAC8D933005D565",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "members_unique_email_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "email"
+        }
+      ],
+      "name": "unique_email",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "members"
+}
\ No newline at end of file
diff --git a/priv/resource_snapshots/repo/members/20251016130855.json b/priv/resource_snapshots/repo/members/20251016130855.json
new file mode 100644
index 0000000..5188002
--- /dev/null
+++ b/priv/resource_snapshots/repo/members/20251016130855.json
@@ -0,0 +1,214 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"uuid_generate_v7()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "first_name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "last_name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "email",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "birth_date",
+      "type": "date"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "paid",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "phone_number",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "join_date",
+      "type": "date"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "exit_date",
+      "type": "date"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "notes",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "city",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "street",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "house_number",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "postal_code",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "search_vector",
+      "type": "tsvector"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "6AAC71BCCA5F112087CEF6877A5BBF74EF8965D5DA4812C44CD6E672F882CC3F",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "members_unique_email_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "email"
+        }
+      ],
+      "name": "unique_email",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "members"
+}
\ No newline at end of file
diff --git a/priv/resource_snapshots/repo/properties/20251016130855.json b/priv/resource_snapshots/repo/properties/20251016130855.json
new file mode 100644
index 0000000..13958c0
--- /dev/null
+++ b/priv/resource_snapshots/repo/properties/20251016130855.json
@@ -0,0 +1,124 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "value",
+      "type": "map"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "properties_member_id_fkey",
+        "on_delete": "delete",
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "members"
+      },
+      "scale": null,
+      "size": null,
+      "source": "member_id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "properties_property_type_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "property_types"
+      },
+      "scale": null,
+      "size": null,
+      "source": "property_type_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "8F90B1AAD1063CF2BB0BDEBBDFBA86AF0B24D854689FB834BC20DFAB2143A451",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "properties_unique_property_per_member_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "member_id"
+        },
+        {
+          "type": "atom",
+          "value": "property_type_id"
+        }
+      ],
+      "name": "unique_property_per_member",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "properties"
+}
\ No newline at end of file
diff --git a/priv/resource_snapshots/repo/users/20250926164519.json b/priv/resource_snapshots/repo/users/20250926164519.json
new file mode 100644
index 0000000..7eb68f2
--- /dev/null
+++ b/priv/resource_snapshots/repo/users/20250926164519.json
@@ -0,0 +1,141 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "email",
+      "type": "citext"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "hashed_password",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "oidc_id",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "users_member_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "members"
+      },
+      "scale": null,
+      "size": null,
+      "source": "member_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "FDEBD4840449609DDA8B50D6741C2EEDE9D81DFBC1E26D4BC77DBD9B5A8EA4DC",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "users_unique_email_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "email"
+        }
+      ],
+      "name": "unique_email",
+      "nils_distinct?": true,
+      "where": null
+    },
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "users_unique_oidc_id_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "oidc_id"
+        }
+      ],
+      "name": "unique_oidc_id",
+      "nils_distinct?": true,
+      "where": null
+    },
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "users_unique_member_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "member_id"
+        }
+      ],
+      "name": "unique_member",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "users"
+}
\ No newline at end of file
diff --git a/priv/resource_snapshots/repo/users/20251016130855.json b/priv/resource_snapshots/repo/users/20251016130855.json
new file mode 100644
index 0000000..2698fd5
--- /dev/null
+++ b/priv/resource_snapshots/repo/users/20251016130855.json
@@ -0,0 +1,141 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "email",
+      "type": "citext"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "hashed_password",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "oidc_id",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "users_member_id_fkey",
+        "on_delete": "nilify",
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "members"
+      },
+      "scale": null,
+      "size": null,
+      "source": "member_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "1D22936DF847949B543000F3E2E4BDA7D78682AAE6EE0CB9CBD55A4F8F4A7228",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "users_unique_email_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "email"
+        }
+      ],
+      "name": "unique_email",
+      "nils_distinct?": true,
+      "where": null
+    },
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "users_unique_member_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "member_id"
+        }
+      ],
+      "name": "unique_member",
+      "nils_distinct?": true,
+      "where": null
+    },
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "users_unique_oidc_id_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "oidc_id"
+        }
+      ],
+      "name": "unique_oidc_id",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "users"
+}
\ No newline at end of file
diff --git a/renovate.json b/renovate.json
index 78fbbad..f134b7b 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:recommended"],
-  "schedule": ["* * 3 * *"],
+  "schedule": ["* * 1-7 * *"],
   "packageRules": [
     {
       "groupName": "Mix dependencies",
diff --git a/test/accounts/user_member_deletion_test.exs b/test/accounts/user_member_deletion_test.exs
new file mode 100644
index 0000000..52a3865
--- /dev/null
+++ b/test/accounts/user_member_deletion_test.exs
@@ -0,0 +1,88 @@
+defmodule Mv.Accounts.UserMemberDeletionTest do
+  @moduledoc """
+  Tests for ON DELETE SET NULL constraint on users.member_id.
+  When a member is deleted, the linked user should remain but with member_id set to NULL.
+  """
+  use Mv.DataCase, async: true
+  alias Mv.Accounts
+  alias Mv.Membership
+
+  describe "User remains when linked Member is deleted (ON DELETE SET NULL)" do
+    @valid_user_attrs %{
+      email: "test@example.com"
+    }
+
+    @valid_member_attrs %{
+      first_name: "John",
+      last_name: "Doe",
+      email: "john@example.com"
+    }
+
+    test "deleting a member sets the user's member_id to NULL" do
+      # Create a member
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      # Create a user linked to the member
+      {:ok, user} =
+        Accounts.create_user(Map.put(@valid_user_attrs, :member, %{id: member.id}))
+
+      # Verify the relationship is established
+      {:ok, user_before_delete} = Ash.get(Mv.Accounts.User, user.id, load: [:member])
+      assert user_before_delete.member_id == member.id
+      assert user_before_delete.member.id == member.id
+
+      # Delete the member
+      :ok = Membership.destroy_member(member)
+
+      # Verify the user still exists but member_id is NULL
+      {:ok, user_after_delete} = Ash.get(Mv.Accounts.User, user.id, load: [:member])
+      assert user_after_delete.id == user.id
+      assert user_after_delete.member_id == nil
+      assert user_after_delete.member == nil
+    end
+
+    test "user can be linked to a new member after old member is deleted" do
+      # Create first member
+      {:ok, member1} = Membership.create_member(@valid_member_attrs)
+
+      # Create user linked to first member
+      {:ok, user} =
+        Accounts.create_user(Map.put(@valid_user_attrs, :member, %{id: member1.id}))
+
+      assert user.member_id == member1.id
+
+      # Delete first member
+      :ok = Membership.destroy_member(member1)
+
+      # Reload user from database to get updated member_id (should be NULL)
+      {:ok, user_after_delete} = Ash.get(Mv.Accounts.User, user.id)
+      assert user_after_delete.member_id == nil
+
+      # Create second member
+      {:ok, member2} =
+        Membership.create_member(%{
+          first_name: "Jane",
+          last_name: "Smith",
+          email: "jane@example.com"
+        })
+
+      # Link user to second member (use reloaded user)
+      {:ok, updated_user} = Accounts.update_user(user_after_delete, %{member: %{id: member2.id}})
+
+      # Verify new relationship
+      {:ok, final_user} = Ash.get(Mv.Accounts.User, updated_user.id, load: [:member])
+      assert final_user.member_id == member2.id
+      assert final_user.member.id == member2.id
+    end
+
+    test "member without linked user can be deleted normally" do
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      # Delete member (no users linked)
+      assert :ok = Membership.destroy_member(member)
+
+      # Verify member is deleted
+      assert {:error, _} = Ash.get(Mv.Membership.Member, member.id)
+    end
+  end
+end
diff --git a/test/accounts/user_member_relationship_test.exs b/test/accounts/user_member_relationship_test.exs
new file mode 100644
index 0000000..b64f5ec
--- /dev/null
+++ b/test/accounts/user_member_relationship_test.exs
@@ -0,0 +1,197 @@
+defmodule Mv.Accounts.UserMemberRelationshipTest do
+  # Using async: true for faster test execution
+  # This is safe because all database operations are sandboxed per test
+  use Mv.DataCase, async: true
+  alias Mv.Accounts
+  alias Mv.Membership
+
+  describe "User-Member Relationship - Basic Tests" do
+    @valid_user_attrs %{
+      email: "test@example.com"
+    }
+
+    @valid_member_attrs %{
+      first_name: "John",
+      last_name: "Doe",
+      email: "john@example.com"
+    }
+
+    test "user can exist without member" do
+      {:ok, user} = Accounts.create_user(@valid_user_attrs)
+      assert user.member_id == nil
+
+      # Load the relationship to test it
+      {:ok, user_with_member} = Ash.get(Mv.Accounts.User, user.id, load: [:member])
+      assert user_with_member.member == nil
+    end
+
+    test "member can exist without user" do
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+      assert member.id != nil
+      assert member.first_name == "John"
+
+      # Load the relationship to test it
+      {:ok, member_with_user} = Ash.get(Mv.Membership.Member, member.id, load: [:user])
+      assert member_with_user.user == nil
+    end
+  end
+
+  describe "User-Member Relationship - Linking Tests" do
+    @valid_user_attrs %{
+      email: "test1@example.com"
+    }
+
+    @valid_member_attrs %{
+      first_name: "Alice",
+      last_name: "Johnson",
+      email: "alice@example.com"
+    }
+
+    test "user can be linked to member during user creation" do
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      user_attrs = Map.put(@valid_user_attrs, :member, %{id: member.id})
+      {:ok, user} = Accounts.create_user(user_attrs)
+
+      # Load the relationship to test it
+      {:ok, user_with_member} = Ash.get(Mv.Accounts.User, user.id, load: [:member])
+      assert user_with_member.member.id == member.id
+    end
+
+    test "member can be linked to user during member creation using manage_relationship" do
+      {:ok, user} = Accounts.create_user(@valid_user_attrs)
+
+      member_attrs = Map.put(@valid_member_attrs, :user, %{id: user.id})
+      {:ok, member} = Membership.create_member(member_attrs)
+
+      # Load the relationship to test it
+      {:ok, member_with_user} = Ash.get(Mv.Membership.Member, member.id, load: [:user])
+      assert member_with_user.user.id == user.id
+    end
+
+    test "user can be linked to member during update" do
+      {:ok, user} = Accounts.create_user(@valid_user_attrs)
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      {:ok, updated_user} = Accounts.update_user(user, %{member: %{id: member.id}})
+
+      # Load the relationship to test it
+      {:ok, user_with_member} = Ash.get(Mv.Accounts.User, updated_user.id, load: [:member])
+      assert user_with_member.member.id == member.id
+    end
+
+    test "member can be linked to user during update using manage_relationship" do
+      {:ok, user} = Accounts.create_user(@valid_user_attrs)
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      {:ok, _updated_member} = Membership.update_member(member, %{user: %{id: user.id}})
+
+      # Load the relationship to test it
+      {:ok, member_with_user} = Ash.get(Mv.Membership.Member, member.id, load: [:user])
+      assert member_with_user.user.id == user.id
+    end
+  end
+
+  describe "User-Member Relationship - Inverse Relationship Tests" do
+    @valid_user_attrs %{
+      email: "test2@example.com"
+    }
+
+    @valid_member_attrs %{
+      first_name: "Bob",
+      last_name: "Smith",
+      email: "bob@example.com"
+    }
+
+    test "ash resolves inverse relationship automatically" do
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      user_attrs = Map.put(@valid_user_attrs, :member, %{id: member.id})
+      {:ok, user} = Accounts.create_user(user_attrs)
+
+      # Load relationships
+      {:ok, user_with_member} = Ash.get(Mv.Accounts.User, user.id, load: [:member])
+      {:ok, member_with_user} = Ash.get(Mv.Membership.Member, member.id, load: [:user])
+
+      assert user_with_member.member.id == member.id
+      assert member_with_user.user.id == user.id
+    end
+
+    test "member can find associated user" do
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      {:ok, user} = Accounts.create_user(%{email: "test3@example.com", member: %{id: member.id}})
+      {:ok, member_with_user} = Ash.get(Mv.Membership.Member, member.id, load: [:user])
+      assert member_with_user.user.id == user.id
+    end
+  end
+
+  describe "User-Member Relationship - Preventing Duplicates" do
+    @valid_user_attrs %{
+      email: "test4@example.com"
+    }
+
+    @valid_member_attrs %{
+      first_name: "Charlie",
+      last_name: "Brown",
+      email: "charlie@example.com"
+    }
+
+    test "prevents overwriting a member of already linked user on update" do
+      {:ok, existing_member} = Membership.create_member(@valid_member_attrs)
+
+      user_attrs = Map.put(@valid_user_attrs, :member, %{id: existing_member.id})
+      {:ok, user} = Accounts.create_user(user_attrs)
+
+      {:ok, member2} =
+        Membership.create_member(%{
+          first_name: "Dave",
+          last_name: "Wilson",
+          email: "dave@example.com"
+        })
+
+      assert {:error, %Ash.Error.Invalid{}} =
+               Accounts.update_user(user, %{member: %{id: member2.id}})
+    end
+
+    test "prevents linking user to already linked member on update" do
+      {:ok, existing_user} = Accounts.create_user(@valid_user_attrs)
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      {:ok, _updated_user} = Accounts.update_user(existing_user, %{member: %{id: member.id}})
+
+      {:ok, user2} = Accounts.create_user(%{email: "test5@example.com"})
+
+      assert {:error, %Ash.Error.Invalid{}} =
+               Accounts.update_user(user2, %{member: %{id: member.id}})
+    end
+
+    test "prevents linking member to already linked user on creation" do
+      {:ok, existing_member} = Membership.create_member(@valid_member_attrs)
+
+      user_attrs = Map.put(@valid_user_attrs, :member, %{id: existing_member.id})
+      {:ok, user} = Accounts.create_user(user_attrs)
+
+      assert {:error, %Ash.Error.Invalid{}} =
+               Membership.create_member(%{
+                 first_name: "Dave",
+                 last_name: "Wilson",
+                 email: "dave@example.com",
+                 user: %{id: user.id}
+               })
+    end
+
+    test "prevents linking user to already linked member on creation" do
+      {:ok, existing_user} = Accounts.create_user(@valid_user_attrs)
+      {:ok, member} = Membership.create_member(@valid_member_attrs)
+
+      {:ok, _updated_user} = Accounts.update_user(existing_user, %{member: %{id: member.id}})
+
+      assert {:error, %Ash.Error.Invalid{}} =
+               Accounts.create_user(%{
+                 email: "test5@example.com",
+                 member: %{id: member.id}
+               })
+    end
+  end
+end
diff --git a/test/mv_web/components/layouts/navbar_test.exs b/test/mv_web/components/layouts/navbar_test.exs
new file mode 100644
index 0000000..b6fa556
--- /dev/null
+++ b/test/mv_web/components/layouts/navbar_test.exs
@@ -0,0 +1,88 @@
+defmodule MvWeb.Layouts.NavbarTest do
+  use MvWeb.ConnCase, async: true
+  import Phoenix.LiveViewTest
+
+  describe "navbar profile section" do
+    test "renders profile button with correct attributes", %{conn: _conn} do
+      # Setup: Create a user
+      user = create_test_user(%{email: "test@example.com"})
+
+      html =
+        render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
+          current_user: user
+        })
+
+      # Test dropdown structure
+      assert html =~ "dropdown-content"
+      assert html =~ "dropdown-end"
+      assert html =~ ~s(role="button")
+
+      # Test profile link
+      assert html =~ ~s(href="/users/#{user.id}")
+      assert html =~ "Profil"
+    end
+
+    @tag :skip
+    # TODO: Implement user initials in navbar avatar - see issue #170
+    test "shows user initials in avatar", %{conn: _conn} do
+      # Setup: Create a user with specific email for testing initials
+      user = create_test_user(%{email: "test.user@example.com"})
+
+      html =
+        render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
+          current_user: user
+        })
+
+      # Initials from test.user@example.com
+      assert html =~ "<span>TU</span>"
+    end
+
+    @tag :skip
+    # TODO: Implement user initials in navbar avatar - see issue #170
+    test "shows different initials for OIDC user", %{conn: _conn} do
+      # Setup: Create OIDC user
+      user_info = %{
+        "sub" => "oidc_123",
+        "preferred_username" => "oidc.user@example.com"
+      }
+
+      oauth_tokens = %{
+        "access_token" => "test_token",
+        "id_token" => "test_id_token"
+      }
+
+      user =
+        Mv.Accounts.User
+        |> Ash.Changeset.for_create(:register_with_rauthy, %{
+          user_info: user_info,
+          oauth_tokens: oauth_tokens
+        })
+        |> Ash.create!(domain: Mv.Accounts)
+
+      html =
+        render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
+          current_user: user
+        })
+
+      # Initials from oidc.user@example.com
+      assert html =~ "<span>OU</span>"
+    end
+
+    test "includes all required navigation items", %{conn: _conn} do
+      user = create_test_user(%{email: "test@example.com"})
+
+      html =
+        render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
+          current_user: user
+        })
+
+      # Check for all required menu items
+      assert html =~ "Profil"
+      assert html =~ "Settings"
+      assert html =~ "Logout"
+
+      # Check for correct logout path
+      assert html =~ ~s(href="/sign-out")
+    end
+  end
+end
diff --git a/test/mv_web/live/profile_navigation_test.exs b/test/mv_web/live/profile_navigation_test.exs
new file mode 100644
index 0000000..8a59656
--- /dev/null
+++ b/test/mv_web/live/profile_navigation_test.exs
@@ -0,0 +1,182 @@
+defmodule MvWeb.ProfileNavigationTest do
+  use MvWeb.ConnCase, async: true
+  import Phoenix.LiveViewTest
+
+  describe "profile navigation" do
+    test "clicking profile button redirects to current user profile", %{conn: conn} do
+      # Setup: Create and login a user
+      user = create_test_user(%{email: "test@example.com"})
+      conn = conn_with_password_user(conn, user)
+      {:ok, view, _html} = live(conn, "/")
+
+      # Click the profile button
+      view |> element("a", "Profil") |> render_click()
+
+      # Verify we're on the profile page
+      assert_redirected(view, "/users/#{user.id}")
+    end
+
+    test "profile navigation shows correct user data", %{conn: conn} do
+      # Setup: Create and login a user
+      user = create_test_user(%{email: "test@example.com"})
+      conn = conn_with_password_user(conn, user)
+
+      # Navigate to profile
+      {:ok, view, _html} = live(conn, "/")
+      view |> element("a", "Profil") |> render_click()
+
+      # Verify profile data
+      {:ok, _profile_view, html} = live(conn, "/users/#{user.id}")
+      assert html =~ to_string(user.email)
+      assert html =~ "Password Authentication"
+      assert html =~ "Enabled"
+    end
+  end
+
+  describe "navbar" do
+    test "renders profile button with correct attributes", %{conn: conn} do
+      # Setup: Create and login a user
+      user = create_test_user(%{email: "test@example.com"})
+      conn = conn_with_password_user(conn, user)
+      {:ok, _view, html} = live(conn, "/")
+
+      assert html =~ ~s(role="button")
+      assert html =~ "dropdown-content"
+      assert html =~ "avatar"
+      assert html =~ "Profil"
+    end
+
+    @tag :skip
+    # TODO: Implement user initials in navbar avatar - see issue #170
+    test "shows user initials in avatar", %{conn: conn} do
+      # Setup: Create and login a user
+      user = create_test_user(%{email: "test.user@example.com"})
+      conn = conn_with_password_user(conn, user)
+      {:ok, _view, html} = live(conn, "/")
+
+      # Initials from test.user@example.com
+      assert html =~ "<span>TU</span>"
+    end
+  end
+
+  describe "profile navigation with OIDC user" do
+    test "shows correct profile data for OIDC user", %{conn: conn} do
+      # Setup: Create OIDC user with sub claim
+      user_info = %{
+        "sub" => "oidc_123",
+        "preferred_username" => "oidc.user@example.com"
+      }
+
+      oauth_tokens = %{
+        "access_token" => "test_token",
+        "id_token" => "test_id_token"
+      }
+
+      user =
+        Mv.Accounts.User
+        |> Ash.Changeset.for_create(:register_with_rauthy, %{
+          user_info: user_info,
+          oauth_tokens: oauth_tokens
+        })
+        |> Ash.create!(domain: Mv.Accounts)
+
+      # Login user via OIDC
+      conn = sign_in_user_via_oidc(conn, user)
+
+      # Navigate to home and click profile
+      {:ok, view, _html} = live(conn, "/")
+      view |> element("a", "Profil") |> render_click()
+
+      # Verify we're on the correct profile page with OIDC specific information
+      {:ok, _profile_view, html} = live(conn, "/users/#{user.id}")
+      assert html =~ to_string(user.email)
+      # OIDC ID should be visible
+      assert html =~ "oidc_123"
+      # Password auth should be disabled for OIDC users
+      assert html =~ "Not enabled"
+    end
+
+    test "profile navigation works across different authentication methods", %{conn: conn} do
+      # Create password user
+      password_user =
+        create_test_user(%{
+          email: "password2@example.com",
+          password: "test_password123"
+        })
+
+      # Create OIDC user
+      user_info = %{
+        "sub" => "oidc_789",
+        "preferred_username" => "oidc@example.com"
+      }
+
+      oauth_tokens = %{
+        "access_token" => "test_token",
+        "id_token" => "test_id_token"
+      }
+
+      oidc_user =
+        Mv.Accounts.User
+        |> Ash.Changeset.for_create(:register_with_rauthy, %{
+          user_info: user_info,
+          oauth_tokens: oauth_tokens
+        })
+        |> Ash.create!(domain: Mv.Accounts)
+
+      # Test with password user
+      conn_password = conn_with_password_user(conn, password_user)
+      {:ok, view_password, _html} = live(conn_password, "/")
+      view_password |> element("a", "Profil") |> render_click()
+      assert_redirected(view_password, "/users/#{password_user.id}")
+
+      # Test with OIDC user
+      conn_oidc = sign_in_user_via_oidc(conn, oidc_user)
+      {:ok, view_oidc, _html} = live(conn_oidc, "/")
+      view_oidc |> element("a", "Profil") |> render_click()
+      assert_redirected(view_oidc, "/users/#{oidc_user.id}")
+    end
+  end
+
+  describe "authenticated views" do
+    setup %{conn: conn} do
+      user = create_test_user(%{email: "test@example.com"})
+      conn = conn_with_password_user(conn, user)
+      {:ok, conn: conn, user: user}
+    end
+
+    @authenticated_paths [
+      "/",
+      "/members",
+      "/members/new",
+      "/properties",
+      "/properties/new",
+      "/property_types",
+      "/property_types/new",
+      "/users",
+      "/users/new"
+    ]
+
+    for path <- @authenticated_paths do
+      @path path
+      test "layout shows user data on #{path}", %{conn: conn, user: user} do
+        {:ok, _view, html} = live(conn, @path)
+        # The navbar (which requires current_user) should be visible
+        assert html =~ "navbar"
+        # Profile button should be visible
+        assert html =~ "Profil"
+        # User ID should be in profile link
+        assert html =~ ~p"/users/#{user.id}"
+      end
+    end
+
+    test "layout shows user data on user profile page", %{conn: conn, user: user} do
+      {:ok, _view, html} = live(conn, ~p"/users/#{user.id}")
+      # The navbar (which requires current_user) should be visible
+      assert html =~ "navbar"
+      # Profile button should be visible
+      assert html =~ "Profil"
+      # User ID should be in profile link
+      assert html =~ ~p"/users/#{user.id}"
+    end
+  end
+end
diff --git a/test/mv_web/user_live/form_test.exs b/test/mv_web/user_live/form_test.exs
index decc789..111ff42 100644
--- a/test/mv_web/user_live/form_test.exs
+++ b/test/mv_web/user_live/form_test.exs
@@ -255,7 +255,7 @@ defmodule MvWeb.UserLive.FormTest do
       conn = Plug.Test.init_test_session(conn, locale: "de")
       {:ok, _view, html} = live(conn, "/users/new")
 
-      assert html =~ "Neuer Benutzer"
+      assert html =~ "Neue*r Benutzer*in"
       assert html =~ "E-Mail"
       assert html =~ "Passwort setzen"
     end
diff --git a/test/mv_web/user_live/index_test.exs b/test/mv_web/user_live/index_test.exs
index 40756eb..6393e3b 100644
--- a/test/mv_web/user_live/index_test.exs
+++ b/test/mv_web/user_live/index_test.exs
@@ -7,7 +7,7 @@ defmodule MvWeb.UserLive.IndexTest do
       conn = conn_with_oidc_user(conn)
       conn = Plug.Test.init_test_session(conn, locale: "de")
       {:ok, _view, html} = live(conn, "/users")
-      assert html =~ "Benutzer auflisten"
+      assert html =~ "Benutzer*innen auflisten"
     end
 
     test "shows translated title in English", %{conn: conn} do
@@ -288,7 +288,7 @@ defmodule MvWeb.UserLive.IndexTest do
              |> element("input[type='checkbox'][name='select_all'][checked]")
              |> has_element?()
 
-      # Select second user 
+      # Select second user
       html = view |> element("input[type='checkbox'][name='#{user2.id}']") |> render_click()
 
       # Now select all should be automatically checked (all individual users are selected)
@@ -362,8 +362,8 @@ defmodule MvWeb.UserLive.IndexTest do
       conn = Plug.Test.init_test_session(conn, locale: "de")
       {:ok, _view, html} = live(conn, "/users")
 
-      assert html =~ "Alle Benutzer auswählen"
-      assert html =~ "Benutzer auswählen"
+      assert html =~ "Alle Benutzer*innen auswählen"
+      assert html =~ "Benutzer*in auswählen"
     end
 
     test "shows English translations for selection", %{conn: conn} do
@@ -388,7 +388,8 @@ defmodule MvWeb.UserLive.IndexTest do
       assert html =~ "Email"
       assert html =~ "OIDC ID"
       # Should show the authenticated user at minimum
-      assert html =~ "user@example.com"
+      # Matches the generated email pattern oidc.user{unique_id}@example.com
+      assert html =~ "oidc.user"
     end
 
     test "handles users with missing OIDC ID", %{conn: conn} do
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index c51fb61..0ee2364 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -100,11 +100,28 @@ defmodule MvWeb.ConnCase do
   Signs in a user via OIDC and returns a connection with the user authenticated.
   By default creates a user with "user@example.com" for consistency.
   """
-  def conn_with_oidc_user(conn, user_attrs \\ %{email: "user@example.com"}) do
-    user = create_test_user(user_attrs)
+  def conn_with_oidc_user(conn, user_attrs \\ %{}) do
+    # Ensure unique email for OIDC users
+    unique_id = System.unique_integer([:positive])
+
+    default_attrs = %{
+      email: "oidc.user#{unique_id}@example.com",
+      oidc_id: "oidc_#{unique_id}"
+    }
+
+    user = create_test_user(Map.merge(default_attrs, user_attrs))
     sign_in_user_via_oidc(conn, user)
   end
 
+  @doc """
+  Signs in a user via password authentication and returns a connection with the user authenticated.
+  """
+  def conn_with_password_user(conn, user) do
+    conn
+    |> Phoenix.ConnTest.init_test_session(%{})
+    |> AshAuthentication.Plug.Helpers.store_in_session(user)
+  end
+
   setup tags do
     Mv.DataCase.setup_sandbox(tags)
     {:ok, conn: Phoenix.ConnTest.build_conn()}