diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64fa4f84..27d87ff8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,9 @@
 name: "ci"
 
 on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
+  pull_request:
+    branches:
+      - "main"
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml
index ee149bf5..0d4870d7 100644
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -6,7 +6,7 @@ on:
       - opened
       - labeled
       - unlabeled
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - labeled
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38ea790e..e969fa94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v5.0.2](https://github.com/puppetlabs/puppetlabs-sqlserver/tree/v5.0.2) - 2024-07-18
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v5.0.1...v5.0.2)
+
+### Fixed
+
+- (CAT-1939) Reverting deferred function changes [#477](https://github.com/puppetlabs/puppetlabs-sqlserver/pull/477) ([Ramesh7](https://github.com/Ramesh7))
+
 ## [v5.0.1](https://github.com/puppetlabs/puppetlabs-sqlserver/tree/v5.0.1) - 2024-02-22
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v5.0.0...v5.0.1)
@@ -18,6 +26,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v4.1.0...v5.0.0)
 
 ### Changed
+
 - [CAT-1065] : Removing support for SQL Server 2012 [#455](https://github.com/puppetlabs/puppetlabs-sqlserver/pull/455) ([rajat-puppet](https://github.com/rajat-puppet))
 
 ### Added
@@ -43,6 +52,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v3.3.0...v4.0.0)
 
 ### Changed
+
 - (CONT-800) - Add Puppet 8/Drop Puppet 6 [#430](https://github.com/puppetlabs/puppetlabs-sqlserver/pull/430) ([jordanbreen28](https://github.com/jordanbreen28))
 
 ## [v3.3.0](https://github.com/puppetlabs/puppetlabs-sqlserver/tree/v3.3.0) - 2023-03-07
@@ -91,6 +101,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.6.2...v3.0.0)
 
 ### Changed
+
 - pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [#369](https://github.com/puppetlabs/puppetlabs-sqlserver/pull/369) ([carabasdaniel](https://github.com/carabasdaniel))
 
 ### Added
diff --git a/manifests/login.pp b/manifests/login.pp
index a081f462..3787919e 100644
--- a/manifests/login.pp
+++ b/manifests/login.pp
@@ -80,10 +80,7 @@
     $create_delete_login_parameters = {
       'disabled'          => $disabled,
       'login'             => $login,
-      'password'          => $password ? {
-        undef => undef,
-        default => Deferred('sprintf', [$password]),
-      },
+      'password'          => $password,
       'check_expiration'  => $check_expiration,
       'check_policy'      => $check_policy,
       'default_language'  => $default_language,
@@ -111,7 +108,7 @@
 
   sqlserver_tsql { "login-${instance}-${login}":
     instance => $instance,
-    command  => stdlib::deferrable_epp("sqlserver/${_create_delete}/login.sql.epp", $create_delete_login_parameters),
+    command  => epp("sqlserver/${_create_delete}/login.sql.epp", $create_delete_login_parameters),
     onlyif   => epp('sqlserver/query/login_exists.sql.epp', $query_login_exists_parameters),
     require  => Sqlserver::Config[$instance],
   }
diff --git a/manifests/user.pp b/manifests/user.pp
index e2f8503b..f58e043f 100644
--- a/manifests/user.pp
+++ b/manifests/user.pp
@@ -65,10 +65,7 @@
   if $create_delete == 'create' {
     $create_delete_user_parameters = {
       'database'        => $database,
-      'password'        => $password ? {
-        undef => undef,
-        default => Deferred('sprintf', [$password]),
-      },
+      'password'        => $password,
       'user'            => $user,
       'login'           => $login,
       'default_schema'  => $default_schema,
@@ -88,7 +85,7 @@
 
   sqlserver_tsql { "user-${instance}-${database}-${user}":
     instance => $instance,
-    command  => stdlib::deferrable_epp("sqlserver/${create_delete}/user.sql.epp", $create_delete_user_parameters),
+    command  => epp("sqlserver/${create_delete}/user.sql.epp", $create_delete_user_parameters),
     onlyif   => epp('sqlserver/query/user_exists.sql.epp', $query_user_exists_parameters),
     require  => Sqlserver::Config[$instance],
   }
diff --git a/metadata.json b/metadata.json
index e5022d0d..c51c2006 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-sqlserver",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "author": "puppetlabs",
   "summary": "The `sqlserver` module installs and manages MS SQL Server 2014, 2016, 2017, 2019 and 2022 on Windows systems.",
   "license": "proprietary",