diff --git a/fineract-provider/config/checkstyle/checkstyle.xml b/fineract-provider/config/checkstyle/checkstyle.xml
index 84195dbfd..e70bca1f0 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/fineract-provider/config/checkstyle/checkstyle.xml
@@ -58,6 +58,7 @@
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
         </module>
+           <module name="OneStatementPerLine"/>
 
 <!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing):
 
@@ -130,7 +131,7 @@
              value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
         </module>
         <module name="ParenPad" />
-        <module name="OneStatementPerLine"/>
+     
         <module name="MultipleVariableDeclarations"/>
         <module name="ArrayTypeStyle"/>
         <module name="MissingSwitchDefault"/>
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailConfigurationWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailConfigurationWritePlatformServiceImpl.java
index 9b110c16c..9c517e3c4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailConfigurationWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailConfigurationWritePlatformServiceImpl.java
@@ -70,7 +70,8 @@ public class EmailConfigurationWritePlatformServiceImpl implements EmailConfigur
             for (EmailConfiguration config : configurations) {
                 if(config.getName() !=null){
                     String value = command.stringValueOfParameterNamed(config.getName());
-                    config.setValue(value); changes.put(config.getName(),value);
+                    config.setValue(value);
+                    changes.put(config.getName(),value);
                     this.repository.saveAndFlush(config);
                 }
             }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierTxnType.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierTxnType.java
index e307e27b7..903443202 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierTxnType.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierTxnType.java
@@ -51,13 +51,17 @@ public class CashierTxnType implements Serializable {
 
         switch(id) {
         case 101:
-            retVal = ALLOCATE; break;
+            retVal = ALLOCATE;
+            break;
         case 102:
-            retVal = SETTLE; break;
+            retVal = SETTLE;
+            break;
         case 103:
-            retVal = INWARD_CASH_TXN; break;
+            retVal = INWARD_CASH_TXN;
+            break;
         case 104:
-            retVal = OUTWARD_CASH_TXN; break;
+            retVal = OUTWARD_CASH_TXN;
+            break;
         default:
             break;
         }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResourceSwagger.java
index da1540031..5d5a25e9c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResourceSwagger.java
@@ -81,7 +81,7 @@ final class UsersApiResourceSwagger {
         @ApiModelProperty(example = "false")
         public Boolean passwordNeverExpires;
         public StaffData staff;
-        public Collection<RoleData> availableRoles;;
+        public Collection<RoleData> availableRoles;
         public Collection<RoleData> selectedRoles;
 
     }