diff --git a/plugins/citadel-paper/src/com/untamedears/citadel/entity/FactionMember.java b/plugins/citadel-paper/src/com/untamedears/citadel/entity/FactionMember.java
index 49eeb5d04..e3207b8c2 100644
--- a/plugins/citadel-paper/src/com/untamedears/citadel/entity/FactionMember.java
+++ b/plugins/citadel-paper/src/com/untamedears/citadel/entity/FactionMember.java
@@ -1,52 +1,52 @@
 package com.untamedears.citadel.entity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 
 /**
- * Created by IntelliJ IDEA.
- * User: chrisrico
- * Date: 3/19/12
- * Time: 5:13 PM
+ * User: JonnyD & chrisrico
+ * Date: 7/18/12
+ * Time: 11:57 PM
  */
+
 @Entity
+@Table(name="faction_member",  uniqueConstraints={
+		   @UniqueConstraint(columnNames={"faction_name", "member_name"})})
 public class FactionMember {
+	@Id private String factionName;
+	@Id private String memberName;
+	
+	public FactionMember(){}
+	
+	public FactionMember(String memberName, String factionName){
+		this.memberName = memberName;
+		this.factionName = factionName;
+	}
 
-    @Id private String factionName;
-    @Id private String memberName;
+	public String getMemberName(){
+		return this.memberName;
+	}
+	
+	public void setMemberName(String memberName){
+		this.memberName = memberName;
+	}
+	
+	public String getFactionName(){
+		return this.factionName;
+	}
+	
+	public void setFactionName(String factionName){
+		this.factionName = factionName;
+	}
 
-    public FactionMember() {
-    }
-
-    public FactionMember(String factionName, String memberName) {
-        this.factionName = factionName;
-        this.memberName = memberName;
-    }
-
-    public String getFactionName() {
-        return factionName;
-    }
-
-    public void setFactionName(String factionName) {
-        this.factionName = factionName;
-    }
-
-    public String getMemberName() {
-        return memberName;
-    }
-
-    public void setMemberName(String memberName) {
-        this.memberName = memberName;
-    }
-
-    @Override
+	@Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof FactionMember)) return false;
-
         FactionMember that = (FactionMember) o;
-
         return factionName.equals(that.factionName) && memberName.equals(that.memberName);
-
     }
 
     @Override