diff --git a/substrate/frame/membership/src/lib.rs b/substrate/frame/membership/src/lib.rs
index acecd456ee..10be4e06f7 100644
--- a/substrate/frame/membership/src/lib.rs
+++ b/substrate/frame/membership/src/lib.rs
@@ -154,8 +154,8 @@ decl_module! {
 
 			let mut members = <Members<T, I>>::get();
 			let location = members.binary_search(&remove).ok().ok_or("not a member")?;
+			let _ = members.binary_search(&add).err().ok_or("already a member")?;
 			members[location] = add.clone();
-			let _location = members.binary_search(&add).err().ok_or("already a member")?;
 			members.sort();
 			<Members<T, I>>::put(&members);
 
@@ -199,8 +199,8 @@ decl_module! {
 			if remove != new {
 				let mut members = <Members<T, I>>::get();
 				let location = members.binary_search(&remove).ok().ok_or("not a member")?;
+				let _ = members.binary_search(&new).err().ok_or("already a member")?;
 				members[location] = new.clone();
-				let _location = members.binary_search(&new).err().ok_or("already a member")?;
 				members.sort();
 				<Members<T, I>>::put(&members);
 
@@ -360,6 +360,15 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn swap_member_works_that_does_not_change_order() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Membership::swap_member(Origin::signed(3), 10, 5));
+			assert_eq!(Membership::members(), vec![5, 20, 30]);
+			assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members());
+		});
+	}
+
 	#[test]
 	fn change_key_works() {
 		new_test_ext().execute_with(|| {
@@ -371,6 +380,15 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn change_key_works_that_does_not_change_order() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Membership::change_key(Origin::signed(10), 5));
+			assert_eq!(Membership::members(), vec![5, 20, 30]);
+			assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members());
+		});
+	}
+
 	#[test]
 	fn reset_members_works() {
 		new_test_ext().execute_with(|| {