diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
index 2a3f92592..a664f9f55 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
@@ -37,13 +37,6 @@ public class UserManageController  extends BaseController{
 	public String list(Model model,HttpServletRequest  request,HttpServletResponse response
 			,@ModelAttribute("cfg")UserManage entity){
 		Page<UserManage> page = userManageService.findPage(new Page<UserManage>(request, response,"r"), entity);
-		if(!StringUtil.isEmpty(entity.getErrorType())){
-			if("create".equals(entity.getErrorType())){
-				Properties msgProp = getMsgProp();
-				String error=msgProp.getProperty("user")+" "+entity.getCgiError()+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
-				model.addAttribute("message", error);
-			}
-		}
 		model.addAttribute("page", page);
 		return "/cfg/maintenance/userManage/list";
 	}
@@ -70,6 +63,8 @@ public class UserManageController  extends BaseController{
 			,String ids
 			,RedirectAttributes redirectAttributes,HttpServletRequest  request){
 			String deleteSuccessIp="";
+			String message="";
+			Properties msgProp = getMsgProp();
 			try{
 				for (String id : ids.split(",")) {
 					UserManage user=userManageService.getUserById(id);
@@ -86,9 +81,11 @@ public class UserManageController  extends BaseController{
 								userManageService.delete(-1,user,ip,lastIp);
 								deleteIpLenth++;
 							} catch (MaatConvertException e) {
+								message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("delete_failed");
 								logger.error("用户vpn新增失败",e);
 								throw e;
 							}catch (Exception e) {
+								message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("delete_failed");
 								logger.error("用户vpn新增失败",e);
 								throw e;
 							}
@@ -99,9 +96,9 @@ public class UserManageController  extends BaseController{
 			}catch(Exception e){
 				logger.error("Delete failed",e);
 				if(e instanceof MaatConvertException) {
-					addMessage(redirectAttributes,"error","cgi_service_failed");
+					addMessage(redirectAttributes,"error",message);
 				}else {
-					addMessage(redirectAttributes,"error","delete_failed");
+					addMessage(redirectAttributes,"error",message);
 				}
 			}
 			
@@ -121,6 +118,8 @@ public class UserManageController  extends BaseController{
 			 String addSuccessIp="";
 			 String deleteIp="";
 			 String deleteSuccessIp="";
+			 String message="";
+			 Properties msgProp = getMsgProp();
 			 boolean isExistUser=false;
 			try {
 				String[] ipArray =entity.getServerIp().split(",");
@@ -145,9 +144,11 @@ public class UserManageController  extends BaseController{
 								addSuccessIp+=addSuccessIp+",";
 							}
 						} catch (MaatConvertException e) {
+							message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
 							logger.error("用户vpn新增失败",e);
 							throw e;
 						}catch (Exception e) {
+							message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
 							logger.error("用户vpn新增失败",e);
 							throw e;
 						}
@@ -169,9 +170,11 @@ public class UserManageController  extends BaseController{
 										userManageService.updatePwd(entity,ip);
 									}
 								} catch (MaatConvertException e) {
+									message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+msgProp.getProperty("update_failed");
 									logger.error("用户vpn密码修改失败",e);
 									throw e;
 								}catch (Exception e) {
+									message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+msgProp.getProperty("update_failed");
 									logger.error("用户vpn密码修改失败",e);
 									throw e;
 								}
@@ -202,9 +205,11 @@ public class UserManageController  extends BaseController{
 										addSuccessIp+=addSuccessIp+",";
 									}
 								} catch (MaatConvertException e) {
+									message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
 									logger.error("用户vpn新增失败",e);
 									throw e;
 								}catch (Exception e) {
+									message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
 									logger.error("用户vpn新增失败",e);
 									throw e;
 								}
@@ -220,9 +225,11 @@ public class UserManageController  extends BaseController{
 										deleteSuccessIp+=deleteSuccessIp+",";
 									}
 								} catch (MaatConvertException e) {
+									message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
 									logger.error("用户vpn删除失败",e);
 									throw e;
 								}catch (Exception e) {
+									message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
 									logger.error("用户vpn删除失败",e);
 									throw e;
 								}
@@ -232,13 +239,13 @@ public class UserManageController  extends BaseController{
 					
 				}
 			} catch (MaatConvertException e) {
-				addMessage(redirectAttributes,"error","cgi_service_failed");
-				return "redirect:" + adminPath +"/maintenance/userManage/list?cgiError="+errorIp+"&errorType="+errorType;
+				addMessage(redirectAttributes,"error",message);
+				return "redirect:" + adminPath +"/maintenance/userManage/list";
 			} catch (Exception e) {
-				addMessage(redirectAttributes,"error","save_failed");
-				return "redirect:" + adminPath +"/maintenance/userManage/list?cgiError="+errorIp+"&errorType="+errorType;
+				addMessage(redirectAttributes,"error",message);
+				return "redirect:" + adminPath +"/maintenance/userManage/list";
 			}
-		return "redirect:" + adminPath +"/maintenance/userManage/list?cgiError="+errorIp+"&errorType="+errorType;
+		return "redirect:" + adminPath +"/maintenance/userManage/list";
 	}
 
 	/**
diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java
index 3f160da1d..2bfd9c3b5 100644
--- a/src/main/java/com/nis/web/service/configuration/UserManageService.java
+++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java
@@ -226,7 +226,7 @@ public class UserManageService extends BaseService{
 		UserManage user=new UserManage();
 		user.setId(entity.getId());
 		if(!lastIp) {
-			user.setServerIp(user.getServerIp().replace(ip+",", ""));
+			user.setServerIp(entity.getServerIp().replace(ip+",", ""));
 		}else {
 			user.setIsValid(-1);
 		}