diff --git a/src/ui/zcl_abapgit_password_dialog.clas.abap b/src/ui/zcl_abapgit_password_dialog.clas.abap
new file mode 100644
index 000000000..c6bfe237c
--- /dev/null
+++ b/src/ui/zcl_abapgit_password_dialog.clas.abap
@@ -0,0 +1,31 @@
+CLASS zcl_abapgit_password_dialog DEFINITION
+  PUBLIC
+  FINAL
+  CREATE PUBLIC .
+
+  PUBLIC SECTION.
+
+    CLASS-METHODS popup
+      IMPORTING
+        !iv_repo_url TYPE string
+      CHANGING
+        !cv_user     TYPE string
+        !cv_pass     TYPE string .
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+
+
+CLASS ZCL_ABAPGIT_PASSWORD_DIALOG IMPLEMENTATION.
+
+
+  METHOD popup.
+
+    PERFORM password_popup
+      IN PROGRAM (sy-cprog)
+      USING iv_repo_url
+      CHANGING cv_user cv_pass.
+
+  ENDMETHOD.
+ENDCLASS.
diff --git a/src/ui/zcl_abapgit_password_dialog.clas.xml b/src/ui/zcl_abapgit_password_dialog.clas.xml
new file mode 100644
index 000000000..6471e21ef
--- /dev/null
+++ b/src/ui/zcl_abapgit_password_dialog.clas.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>ZCL_ABAPGIT_PASSWORD_DIALOG</CLSNAME>
+    <VERSION>1</VERSION>
+    <LANGU>E</LANGU>
+    <DESCRIPT>Password popup</DESCRIPT>
+    <EXPOSURE>2</EXPOSURE>
+    <STATE>1</STATE>
+    <CLSFINAL>X</CLSFINAL>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_forms.prog.abap b/src/zabapgit_forms.prog.abap
index aadd5adab..fe54f6540 100644
--- a/src/zabapgit_forms.prog.abap
+++ b/src/zabapgit_forms.prog.abap
@@ -123,3 +123,19 @@ FORM exit RAISING zcx_abapgit_exception.
       ENDIF.
   ENDCASE.
 ENDFORM.
+
+FORM password_popup
+      USING
+        iv_repo_url TYPE string
+      CHANGING
+        cv_user     TYPE string
+        cv_pass     TYPE string.
+
+  lcl_password_dialog=>popup(
+    EXPORTING
+      iv_repo_url     = iv_repo_url
+    CHANGING
+      cv_user         = cv_user
+      cv_pass         = cv_pass ).
+
+ENDFORM.
diff --git a/src/zabapgit_http.prog.abap b/src/zabapgit_http.prog.abap
index 6d9537e42..1314a2bad 100644
--- a/src/zabapgit_http.prog.abap
+++ b/src/zabapgit_http.prog.abap
@@ -35,7 +35,7 @@ CLASS lcl_proxy_auth IMPLEMENTATION.
 
   METHOD enter.
 
-    lcl_password_dialog=>popup(
+    zcl_abapgit_password_dialog=>popup(
       EXPORTING
         iv_repo_url = 'Proxy Authentication'
       CHANGING
@@ -237,7 +237,7 @@ CLASS lcl_http IMPLEMENTATION.
     lv_default_user = zcl_abapgit_persistence_user=>get_instance( )->get_repo_login( iv_url ).
     lv_user         = lv_default_user.
 
-    lcl_password_dialog=>popup(
+    zcl_abapgit_password_dialog=>popup(
       EXPORTING
         iv_repo_url     = iv_url
       CHANGING
diff --git a/src/zabapgit_password_dialog.prog.abap b/src/zabapgit_password_dialog.prog.abap
index 354f0d44d..1ba7802d7 100644
--- a/src/zabapgit_password_dialog.prog.abap
+++ b/src/zabapgit_password_dialog.prog.abap
@@ -23,6 +23,10 @@ SELECTION-SCREEN END OF SCREEN 1002.
 *-----------------------------------------------------------------------
 CLASS lcl_password_dialog DEFINITION FINAL.
 
+**************
+* This class will remain local in the report
+**************
+
   PUBLIC SECTION.
     CONSTANTS dynnr TYPE char4 VALUE '1002'.