diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m
index f29c1a4b4..478a7fc9e 100644
--- a/Classes/FirstLoginViewController.m
+++ b/Classes/FirstLoginViewController.m
@@ -37,7 +37,14 @@
 	//[passwd setText:[[NSUserDefaults standardUserDefaults] stringForKey:@"password_preference"]];
 }
 
-
+-(void) viewDidLoad {
+	NSString* siteUrl = [[NSUserDefaults standardUserDefaults] stringForKey:@"firt_login_view_url"];
+	if (siteUrl==nil) {
+		siteUrl=@"http://www.linphone.org";
+	}
+	[site setTitle:siteUrl forState:UIControlStateNormal];
+	
+}
 
 - (void)dealloc {
     [super dealloc];
@@ -51,7 +58,7 @@
 
 -(void) doOk:(id)sender {
 	if (sender == site) {
-		NSURL *url = [NSURL URLWithString:@"http://www.linphone.org"];
+		NSURL *url = [NSURL URLWithString:site.titleLabel.text];
 		[[UIApplication sharedApplication] openURL:url];
 		return;
 	}
diff --git a/Classes/FirstLoginViewController.xib b/Classes/FirstLoginViewController.xib
index 2c8342a90..ef6a7d25e 100644
--- a/Classes/FirstLoginViewController.xib
+++ b/Classes/FirstLoginViewController.xib
@@ -69,7 +69,6 @@
 								<double key="NSSize">15</double>
 								<int key="NSfFlags">16</int>
 							</object>
-							<string key="IBUINormalTitle">http://www.linphone.org</string>
 							<object class="NSColor" key="IBUIHighlightedTitleColor" id="992101396">
 								<int key="NSColorSpace">3</int>
 								<bytes key="NSWhite">MQA</bytes>
@@ -472,7 +471,7 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>{{85, 76}, {320, 480}}</string>
+					<string>{{85, 91}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<boolean value="NO"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m
index 0932a5210..62536c0d0 100644
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@@ -190,7 +190,7 @@ static void linphone_iphone_call_state(LinphoneCore *lc, LinphoneCall* call, Lin
 	} else if (state == LinphoneRegistrationCleared || state == LinphoneRegistrationNone) {
 		[registrationDelegate displayNotRegisteredFromUI:mCurrentViewController];
 	} else 	if (state == LinphoneRegistrationFailed ) {
-		NSString* lErrorMessage;
+		NSString* lErrorMessage=nil;
 		if (linphone_proxy_config_get_error(cfg) == LinphoneReasonBadCredentials) {
 			lErrorMessage = @"Bad credentials, check your account settings";
 		} else if (linphone_proxy_config_get_error(cfg) == LinphoneReasonNoResponse) {