diff --git a/deps/oauth2_client/src/oauth2_client.erl b/deps/oauth2_client/src/oauth2_client.erl
index e69d55e1ab..a6a75f0bbe 100644
--- a/deps/oauth2_client/src/oauth2_client.erl
+++ b/deps/oauth2_client/src/oauth2_client.erl
@@ -77,12 +77,17 @@ build_openid_discovery_endpoint(Issuer, OpenIdConfigurationPath, Params) ->
             {_, Q} -> 
                 URLMap1#{query => uri_string:compose_query(Q ++ Params)}
         end).
-ensure_leading_path_separator(Path) ->
+ensure_leading_path_separator(Path) when is_binary(Path) ->
+    ensure_leading_path_separator(binary:bin_to_list(Path));
+ensure_leading_path_separator(Path) when is_list(Path) ->
     case string:slice(Path, 0, 1) of 
         "/" -> Path;
         _ -> "/" ++ Path
     end.
-drop_trailing_path_separator(Path) ->
+drop_trailing_path_separator(Path) when is_binary(Path) ->
+    drop_trailing_path_separator(binary:bin_to_list(Path));
+drop_trailing_path_separator("") -> "";
+drop_trailing_path_separator(Path) when is_list(Path) ->
     case string:slice(Path, string:len(Path)-1, 1) of 
         "/" -> lists:droplast(Path);
         _ -> Path
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl
index cc3f0b3f48..854bb8784a 100644
--- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl
+++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl
@@ -129,7 +129,9 @@ produce_auth_settings(MgtResourceServers, ManagementProps) ->
         case proplists:get_value(oauth_initiated_logon_type, ManagementProps, sp_initiated) of
           sp_initiated -> {};
           idp_initiated -> {oauth_initiated_logon_type, <<"idp_initiated">>}
-        end
+        end,
+        to_tuple(oauth_authorization_endpoint_params, ManagementProps),
+        to_tuple(oauth_token_endpoint_params, ManagementProps)
       ])
   end.