diff --git a/BlazorWasmDemo/Client/Shared/MainLayout.razor b/BlazorWasmDemo/Client/Shared/MainLayout.razor
index 18da6079..96f5c1c5 100644
--- a/BlazorWasmDemo/Client/Shared/MainLayout.razor
+++ b/BlazorWasmDemo/Client/Shared/MainLayout.razor
@@ -30,7 +30,7 @@
 
 <footer style="margin-top: 20vh">
     <p>
-        <strong>Fido2 .NET library</strong> by <a href="https://github.com/abergs/">Anders Åberg</a>, <a href="https://github.com/aseigler">Alex Seigler</a> and <a href="https://github.com/passwordless-lib/fido2-net-lib/graphs/contributors">contributors</a>. The source code is licensed
+        <strong>Fido2 .NET library</strong> by <a href="https://github.com/abergs">Anders Åberg</a>, <a href="https://github.com/aseigler">Alex Seigler</a> and <a href="https://github.com/passwordless-lib/fido2-net-lib/graphs/contributors">contributors</a>. The source code is licensed
         <a href="http://opensource.org/licenses/mit-license.php">MIT</a>. Available on <a href="https://github.com/passwordless-lib/fido2-net-lib">Github</a>
     </p>
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 694e8722..57da1a5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # FIDO2 .NET library (WebAuthn)
 
-[Readme](https://github.com/abergs/fido2-net-lib/blob/master/README.md) 
+[Readme](https://github.com/passwordless-lib/fido2-net-lib/blob/master/README.md) 
 
 2020-03-24 1.1.0
 - Refactored FIDO2 model
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3382a0cc..bc097559 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to Fido2NetLib
 
-The project is open to contributions through PRs. Discussions, feature requests and bug reports are encouraged through [issues](https://github.com/abergs/fido2-net-lib/issues).
+The project is open to contributions through PRs. Discussions, feature requests and bug reports are encouraged through [issues](https://github.com/passwordless-lib/fido2-net-lib/issues).
 
 Since Fido2-net-lib is part of the .NET Foundation, we ask our contributors to abide by their [Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
 
diff --git a/Demo/Pages/_Layout.cshtml b/Demo/Pages/_Layout.cshtml
index 7509e01c..db55ac35 100644
--- a/Demo/Pages/_Layout.cshtml
+++ b/Demo/Pages/_Layout.cshtml
@@ -58,14 +58,14 @@
                             <a class="navbar-item" asp-page="/overview">
                                 Home
                             </a>
-                            <a class="navbar-item" href="https://github.com/abergs/fido2-net-lib#examples">
+                            <a class="navbar-item" href="https://github.com/passwordless-lib/fido2-net-lib#examples">
                                 Documentation
                             </a>
                             <a class="navbar-item" href="https://opencollective.com/passwordless">
                                 Become a backer
                             </a>                            
                             <span class="navbar-item">
-                                <a class="button is-info is-inverted" href="https://github.com/abergs/fido2-net-lib">
+                                <a class="button is-info is-inverted" href="https://github.com/passwordless-lib/fido2-net-lib">
                                     <span class="icon">
                                         <i class="fab fa-github"></i>
                                     </span>
@@ -117,8 +117,8 @@
     <footer class="footer" style="        margin-top: 20vh">
         <div class="content has-text-centered">
             <p>
-                <strong>Fido2 .NET library</strong> by <a href="https://github.com/abergs/">Anders Åberg</a>, <a href="https://github.com/aseigler">Alex Seigler</a> and <a href="https://github.com/abergs/fido2-net-lib/graphs/contributors">contributors</a>. The source code is licensed
-                <a href="http://opensource.org/licenses/mit-license.php">MIT</a>. Available on <a href="https://github.com/abergs/fido2-net-lib">Github</a>
+                <strong>Fido2 .NET library</strong> by <a href="https://github.com/abergs">Anders Åberg</a>, <a href="https://github.com/aseigler">Alex Seigler</a> and <a href="https://github.com/passwordless-lib/fido2-net-lib/graphs/contributors">contributors</a>. The source code is licensed
+                <a href="http://opensource.org/licenses/mit-license.php">MIT</a>. Available on <a href="https://github.com/passwordless-lib/fido2-net-lib">Github</a>
             </p>
 
             <p><small>Supported by the <a href="https://dotnetfoundation.org">.NET Foundation</a></small></p>
diff --git a/Demo/Pages/overview.cshtml b/Demo/Pages/overview.cshtml
index a24d5878..d0ac2c06 100644
--- a/Demo/Pages/overview.cshtml
+++ b/Demo/Pages/overview.cshtml
@@ -15,7 +15,7 @@
                     </p>
                     <p>Bringing FIDO2 &amp; WebAuthn to asp.net, .net core and full framework.</p>
                     <p>
-                        Available on <a href="https://github.com/abergs/fido2-net-lib">GitHub</a> and <a href="https://www.nuget.org/packages/Fido2">Nuget</a>.
+                        Available on <a href="https://github.com/passwordless-lib/fido2-net-lib">GitHub</a> and <a href="https://www.nuget.org/packages/Fido2">Nuget</a>.
                     </p>
                 </div>
 
diff --git a/Demo/UrlHelperExtensions.cs b/Demo/UrlHelperExtensions.cs
index 440f2e4f..0d690918 100644
--- a/Demo/UrlHelperExtensions.cs
+++ b/Demo/UrlHelperExtensions.cs
@@ -6,6 +6,6 @@ public static class UrlHelperExtensions
 {
     public static string ToGithub(this IUrlHelper url, string path)
     {
-        return "https://github.com/abergs/fido2-net-lib/blob/master/" + path;
+        return "https://github.com/passwordless-lib/fido2-net-lib/blob/master/" + path;
     }
 }
diff --git a/Demo/wwwroot/login.html b/Demo/wwwroot/login.html
index 738bbcc8..ee74672c 100644
--- a/Demo/wwwroot/login.html
+++ b/Demo/wwwroot/login.html
@@ -105,7 +105,7 @@ <h2 class="form-signin-heading text-center">FIDO2 .NET lib Demo</h2>
                     Currently, the WebAuthn spec supports credential creation and assertion best using U2F Token, like those provided by Yubico and Feitian.
 
                 </p>
-                <p>The code for this demo can be found at the <a href="https://github.com/abergs/fido2-net-lib">Fido2.net-lib repo</a> and the original source <a href="https://github.com/duo-labs/webauthn">here</a>.</p>
+                <p>The code for this demo can be found at the <a href="https://github.com/passwordless-lib/fido2-net-lib">Fido2.net-lib repo</a> and the original source <a href="https://github.com/duo-labs/webauthn">here</a>.</p>
                 <p>
                     To see what's happening under the hood when you create a test user and login using WebAuthn below, you can open your web browser's console and
                     see the output of the necessary credential objects being used.
@@ -187,7 +187,7 @@ <h2 class="form-signin-heading text-center">FIDO2 .NET lib Demo</h2>
             </div>
         </div>
         <div class="footer text-center fixed-bottom">
-            <span>Made with &lt;3 by <a href="https://github.com/abergs/fido2-net-lib/graphs/contributors">the contributors on github</a></span>
+            <span>Made with &lt;3 by <a href="https://github.com/passwordless-lib/fido2-net-lib/graphs/contributors">the contributors on github</a></span>
         </div>
     </div>
 
diff --git a/Src/Fido2/build/fido2.targets b/Src/Fido2/build/fido2.targets
index ae71515b..b63e8fdd 100644
--- a/Src/Fido2/build/fido2.targets
+++ b/Src/Fido2/build/fido2.targets
@@ -5,6 +5,6 @@
     <Error  Code="FI0404"
             File="$(MSBuildProjectFullPath)"
             Text="FIDO2 cannot be used with .NET 4.6.1 and .NET 4.6.2 due to missing APIs. %0a%0d
-                  Visit https://github.com/abergs/fido2-net-lib/blob/master/Documentation/NET46X.md for more information." />
+                  Visit https://github.com/passwordless-lib/fido2-net-lib/blob/master/Documentation/NET46X.md for more information." />
   </Target>
 </Project>
\ No newline at end of file