diff --git a/tests/user_management.rb b/tests/user_management.rb
index ded7174..8b93273 100644
--- a/tests/user_management.rb
+++ b/tests/user_management.rb
@@ -23,7 +23,7 @@
 #---
 class Test_09_MIPADMIN_party_management< Test::Unit::TestCase
   #
-  #Test we can logon to the system using the webmip administrator user’s login credentials and check that 
+  #Test we can logon to the system using the webmip administrator user�s login credentials and check that 
   #all the fields required for creating parties in the system are correctly displayed.
   #
   def test_01_screen_appears
@@ -570,7 +570,7 @@ class Test_11_edit_parties< Test::Unit::TestCase
     @@ie.wait    
     #check market participant fields
     @@ie.select_list(:id,'P65_PRTY_TYPE').set('Market Participant')
-    @@ie.link(:name,'Edit Supplier1 SU1').click
+    @@ie.link(:name,/Edit Supplier1 SU1/).click
     @@ie.wait    
     assert(@@ie.button(:value,'Cancel').exists?,'Could not find Cancel button(mktp fields)')
     assert(@@ie.button(:value,'Delete').exists?,'Could not find Delete button')
@@ -639,6 +639,8 @@ class Test_11_edit_parties< Test::Unit::TestCase
     #edit a different user
     #@@ie.goto(EDIT_PARTIES)
     @@ie.select_list(:id,'P65_PRTY_TYPE').set('User')
+    @@ie.link(:text,/Next/).click
+    @@ie.wait
     @@ie.link(:name,'Edit SuppAgent1 ').click
     @@ie.wait    
     @@ie.text_field(:id,'P66_TELEPHONE').set('01234 567899')
@@ -665,7 +667,7 @@ class Test_11_edit_parties< Test::Unit::TestCase
     
     @@ie.goto(LOGIN)
     #we'll need to login as a SUPPADMIN user
-    login('Agent1','Passw0rd.')
+    login('SuppAdmin1','Passw0rd.')
     
     #Navigate to the page using the menu
     menu('Administration')
@@ -680,7 +682,7 @@ class Test_11_edit_parties< Test::Unit::TestCase
     @@ie.wait    
     assert(@@ie.contains_text('Action Processed.'),'Party not updated correctly')
     
-    @@ie.link(:name,'Edit SuppAgent1 ').click
+    @@ie.link(:name,/Edit SuppAgent1/).click
     @@ie.wait
     @@ie.text_field(:id,'P66_TELEPHONE').set('01234 567809')
     @@ie.button(:value,'Apply Changes').click