diff --git a/Classes/AssistantView.h b/Classes/AssistantView.h
index 70a7e006f..536643274 100644
--- a/Classes/AssistantView.h
+++ b/Classes/AssistantView.h
@@ -58,7 +58,7 @@
 @property(nonatomic, strong) IBOutlet UIImageView *welcomeLogoImage;
 @property(nonatomic, strong) IBOutlet UIButton *gotoCreateAccountButton;
 @property(nonatomic, strong) IBOutlet UIButton *gotoLinphoneLoginButton;
-@property(nonatomic, strong) IBOutlet UIView *gotoLinphoneSpecificFeatureWarningButton;
+@property(nonatomic, strong) IBOutlet UIButton *gotoLinphoneSpecificFeatureWarningButton;
 @property(nonatomic, strong) IBOutlet UIButton *gotoLoginButton;
 @property(nonatomic, strong) IBOutlet UIButton *gotoRemoteProvisioningButton;
 @property (weak, nonatomic) IBOutlet UILabel *phoneLabel;
diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index a1ea5ce54..ef6bae82d 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -310,7 +310,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	BOOL acceptTerms = [LinphoneManager.instance lpConfigBoolForKey:@"accept_terms" withDefault:FALSE];
 	UIImage *image = acceptTerms ? [UIImage imageNamed:@"checkbox_checked.png"] : [UIImage imageNamed:@"checkbox_unchecked.png"];
 	[_acceptButton setImage:image forState:UIControlStateNormal];
-	_gotoRemoteProvisioningButton.enabled = _gotoLinphoneLoginButton.enabled = _gotoCreateAccountButton.enabled = _gotoLoginButton.enabled = acceptTerms;
+	_gotoRemoteProvisioningButton.enabled = _gotoLinphoneLoginButton.enabled = _gotoCreateAccountButton.enabled = _gotoLinphoneSpecificFeatureWarningButton.enabled = acceptTerms;
 }
 
 + (NSString *)errorForLinphoneAccountCreatorPhoneNumberStatus:(LinphoneAccountCreatorPhoneNumberStatus)status {
@@ -1361,12 +1361,13 @@ void assistant_is_account_linked(LinphoneAccountCreator *creator, LinphoneAccoun
 
 // Change button color and wait the display of this
 #define ONCLICKBUTTON(button, timewaitmsec, body) \
+UIColor *previousColor = (UIColor*)[sender backgroundColor]; \
 [button setBackgroundColor:[UIColor lightGrayColor]]; \
     _waitView.hidden = NO; \
     dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (timewaitmsec * NSEC_PER_MSEC)); \
     dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ \
         body \
-        [button setBackgroundColor:[UIColor clearColor]]; \
+        [button setBackgroundColor:previousColor]; \
         _waitView.hidden = YES; \
     }); \