diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0ad9475
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+# Development artifacts
+.DS_Store
+.vscode
+/vendor/
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..b7c2018
--- /dev/null
+++ b/README.md
@@ -0,0 +1,8 @@
+## INTRODUCTION
+
+The PSUL User Auth module is a alter user and authentication for PSU Library
+sites.
+
+The primary use case for this module is:
+
+- Ensure username set after authentication is NOT the email.
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..8a5c75c
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+    "name": "psul-libraries/psul_user_auth",
+    "description": "Adds functionality to alter users and user authentication",
+    "type": "drupal-module",
+    "license": "GPL-2.0-or-later",
+    "authors": [
+        {
+            "name": "Mike Henninger",
+            "email": "msh6004@psu.edu"
+        }
+    ],
+    "minimum-stability": "dev",
+    "require": {}
+}
diff --git a/psul_user_auth.info.yml b/psul_user_auth.info.yml
new file mode 100644
index 0000000..4531985
--- /dev/null
+++ b/psul_user_auth.info.yml
@@ -0,0 +1,8 @@
+name: 'PSUL User Auth'
+type: module
+description: 'Adds functionality to alter users and user authentication'
+package: PSU Libraries
+core_version_requirement: ^10 || ^11
+dependencies:
+  - drupal:user
+  - openid_connect:openid_connect
diff --git a/psul_user_auth.module b/psul_user_auth.module
new file mode 100644
index 0000000..6b15dbc
--- /dev/null
+++ b/psul_user_auth.module
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Primary module hooks for PSUL User Auth module.
+ */
+
+/**
+ * Implements hook_openid_connect_userinfo_alter().
+ *
+ * Altering the following user data to ensure consist authentication.
+ * - Email prevent user aliases from being used,
+ * - Username (should NOT include '@psu.edu'),
+ * - OIDC Name to include username (e.g. "Henninger, Mike (msh6004)").
+ *
+ * All changes are based on the User.Identity.Name (UPN) value.
+ */
+function psul_user_auth_openid_connect_userinfo_alter(array &$userinfo, array $context) {
+
+  // Remove @psu.edu from the username.
+  preg_match('/^(.+)@([^@]+)$/i', $userinfo['upn'], $matches);
+
+  // Nothing else to do if the default email is not an email.
+  if (!isset($matches[1])) {
+    return;
+  }
+
+  // Forcing none alias email to be used.
+  $userinfo['email'] = $userinfo['upn'];
+
+  // Adding username to name so that users are unique.
+  $userinfo['name'] .= " (" . $matches[1] . ")";
+
+  // Set the preferred username to strip out "@psu.edu".
+  $userinfo['preferred_username'] = $matches[1];
+}
+
+/**
+ * Implements hook_user_format_name_alter().
+ */
+function psul_user_auth_user_format_name_alter(&$name, $account) {
+  // Ensure that usernames are not displayed if they are email addresses, or if
+  // they are generated names starting with 'oidc_'.
+  $oidc_name = \Drupal::service('user.data')->get('openid_connect', $account->id(), 'oidc_name');
+
+  if (empty($oidc_name) || strpos($oidc_name, 'oidc_') === 0) {
+    return;
+  }
+
+  // Always display the oidc_name if it is set.
+  $name = $oidc_name;
+}