diff --git a/src/main/java/org/upsmf/grievance/dao/impl/SuperAdminDaoImpl.java b/src/main/java/org/upsmf/grievance/dao/impl/SuperAdminDaoImpl.java
index ad053e85d634f3a2e908fbc6e1d1147fe4ad94da..abeade1a468b73d21fcf02302bf6f751f2a6bbbf 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/SuperAdminDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/SuperAdminDaoImpl.java
@@ -132,7 +132,7 @@ public class SuperAdminDaoImpl implements SuperAdminDao {
 						return statement;
 					}
 				}, keyHolder);
-				organization.setId((Long) keyHolder.getKey());
+				organization.setId(keyHolder.getKey().longValue());
 				MasterDataManager.getOrgIdAndOrgNameMap().put(organization.getId(), organization.getOrgName());
 			} catch (Exception e) {
 				LOGGER.error(
@@ -140,7 +140,7 @@ public class SuperAdminDaoImpl implements SuperAdminDao {
 			}
 			if (insertSuccessful > 0) {
 				jdbcTemplate.update(Sql.UserQueries.NEW_ORG_AUTH, new Object[] { organization.getId(),
-						organization.getAuthId(), organization.getUrl(), organization.getEmailDomain() });
+						Integer.valueOf(organization.getAuthId()), organization.getUrl(), organization.getEmailDomain() });
 				orgSetup(organization, userId);
 				return organization;
 			}
diff --git a/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java b/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java
index 4058ea71d0d37a3b1cafe4f8be2713f2491b78ce..f2480e54753ee7a8f46bbccbed0173f9b1fd4e02 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java
@@ -444,7 +444,7 @@ public class UserDaoImpl implements UserDao {
 	public Long checkUserNameExists(String username) {
 		Long userId;
 		try {
-			userId = jdbcTemplate.queryForObject("SELECT id FROM user WHERE username = ?", new Object[] { username },
+			userId = jdbcTemplate.queryForObject("SELECT \"user\".id FROM \"user\" WHERE username =?", new Object[] { username },
 					Long.class);
 		} catch (Exception e) {
 			return 0l;