diff --git a/addons/l10n_in_edi/views/res_config_settings_views.xml b/addons/l10n_in_edi/views/res_config_settings_views.xml
index 005cbfcc8ce..a6566acb223 100644
--- a/addons/l10n_in_edi/views/res_config_settings_views.xml
+++ b/addons/l10n_in_edi/views/res_config_settings_views.xml
@@ -17,18 +17,24 @@
             <app name="account" position="inside">
                 <block title="Indian Electronic Invoicing" name="l10n_in_edi_iap" attrs="{'invisible': [('country_code', '!=', 'IN')]}">
                     <setting id="gsp_setting" string="Setup E-invoice" help="Check the documentation to get credentials" documentation="/applications/finance/accounting/fiscal_localizations/localizations/india.html" company_dependent="1">
-                            <div class="content-group mt16">
-                                <label for="l10n_in_edi_username" string="Username" class="col-lg-3 o_light_label"/>
-                                <field name="l10n_in_edi_username" nolabel="1"/>
+                        <div class="content-group">
+                            <div class="mt16 row">
+                                <label for="l10n_in_edi_username" string="Username" class="col-3 col-lg-3 o_light_label"/>
+                                <field name="l10n_in_edi_username"  nolabel="1"/>
                             </div>
-                            <div class="content-group">
-                                <label for="l10n_in_edi_password" string="Password" class="col-lg-3 o_light_label" />
+                            <div class="row">
+                                <label for="l10n_in_edi_password" string="Password" class="col-3 col-lg-3 o_light_label" />
                                 <field name="l10n_in_edi_password" password="True" nolabel="1"/>
                             </div>
-                            <div class="content-group">
-                                <label for="l10n_in_edi_production_env" string="Production Environment" class="col-lg-3 o_light_label"/>
+                            <div class="row">
+                                <label for="l10n_in_edi_production_env" string="Production Environment" class="col-3 col-lg-3 o_light_label"/>
                                 <field name="l10n_in_edi_production_env" nolabel="1"/>
                             </div>
+                        </div>
+                        <div class="content-group">
+                            <label for="l10n_in_edi_production_env" string="Production Environment" class="col-lg-3 o_light_label"/>
+                            <field name="l10n_in_edi_production_env" nolabel="1"/>
+                        </div>
                         <div class='mt8'>
                             <button name="l10n_in_edi_test" icon="fa-arrow-right" type="object" string="Verify Username and Password" class="btn-link"/>
                         </div>